Commit e65b3095 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes: the only core change is a minor error
  code handling in the control API, and all the rest are device-specific
  fixes, mostly quirks, fixups and ASoC Intel fixes.

  It looks boring, and good so"

* tag 'sound-5.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: mixart: Fix mutex deadlock
  ALSA: hda/ca0132: Fix compile warning without PCI
  ASOC: Intel: kbl_rt5663_rt5514_max98927: Do not try to disable disabled clock
  ALSA: usb-audio: Add delay quirk for all Logitech USB devices
  ASoC: Intel: catpt: Correct clock selection for dai trigger
  ASoC: Intel: catpt: Skip position update for unprepared streams
  ASoC: qcom: lpass-platform: Fix memory leak
  ASoC: Intel: KMB: Fix S24_LE configuration
  ALSA: hda: Add Alderlake-S PCI ID and HDMI codec vid
  ALSA: usb-audio: Use ALC1220-VB-DT mapping for ASUS ROG Strix TRX40 mobo
  ALSA: firewire: Clean up a locking issue in copy_resp_to_buf()
  ASoC: rt1015: increase the time to detect BCLK
  ALSA: ctl: fix error path at adding user-defined element set
  ALSA: hda/realtek - HP Headset Mic can't detect after boot
  ALSA: hda/realtek - Add supported mute Led for HP
  ALSA: hda/realtek: Add some Clove SSID in the ALC293(ALC1220)
  ALSA: hda/realtek - Add supported for Lenovo ThinkPad Headset Button
  ASoC: rt1015: add delay to fix pop noise from speaker
parents 46cbc18e aecd1fbe

Documentation/devicetree/bindings/sound/rt1015.txt

+6 −0
Original line number Diff line number Diff line
@@ -8,10 +8,16 @@ Required properties: 


- reg : The I2C address of the device.



Optional properties:



- realtek,power-up-delay-ms

  Set a delay time for flush work to be completed,

  this value is adjustable depending on platform.



Example:



rt1015: codec@28 {

	compatible = "realtek,rt1015";

	reg = <0x28>;

	realtek,power-up-delay-ms = <50>;

};

include/sound/rt1015.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * linux/sound/rt1015.h -- Platform data for RT1015

 *

 * Copyright 2020 Realtek Microelectronics

 */



#ifndef __LINUX_SND_RT1015_H

#define __LINUX_SND_RT1015_H



struct rt1015_platform_data {

	unsigned int power_up_delay_ms;

};



#endif

sound/core/control.c

+1 −1
Original line number Diff line number Diff line
@@ -1539,7 +1539,7 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, 


 unlock:

	up_write(&card->controls_rwsem);

	return 0;

	return err;

}



static int snd_ctl_elem_add_user(struct snd_ctl_file *file,

sound/firewire/fireworks/fireworks_transaction.c

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ copy_resp_to_buf(struct snd_efw *efw, void *data, size_t length, int *rcode) 
	t = (struct snd_efw_transaction *)data;

	length = min_t(size_t, be32_to_cpu(t->length) * sizeof(u32), length);



	spin_lock_irq(&efw->lock);

	spin_lock(&efw->lock);



	if (efw->push_ptr < efw->pull_ptr)

		capacity = (unsigned int)(efw->pull_ptr - efw->push_ptr);
@@ -190,7 +190,7 @@ handle_resp_for_user(struct fw_card *card, int generation, int source, 


	copy_resp_to_buf(efw, data, length, rcode);

end:

	spin_unlock_irq(&instances_lock);

	spin_unlock(&instances_lock);

}



static void

sound/pci/hda/hda_intel.c

+3 −0
Original line number Diff line number Diff line
@@ -2506,6 +2506,9 @@ static const struct pci_device_id azx_ids[] = { 
	/* DG1 */

	{ PCI_DEVICE(0x8086, 0x490d),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Alderlake-S */

	{ PCI_DEVICE(0x8086, 0x7ad0),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Elkhart Lake */

	{ PCI_DEVICE(0x8086, 0x4b55),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

CRA Git | Maintained and supported by SUSTech CRA and CCSE