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

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

Pull sound fixes from Takashi Iwai:
 "Still a bit higher amount than wished, but nothing looks really scary,
  and all changes are about nice and smooth device-specific fixes.

   - HD-audio quirks, one revert for a regression and another oneliner

   - AMD ACP quirks

   - Fixes for SDCA interrupt handling

   - A few Intel SOF, avs and NVL fixes

   - Fixes for TAS2552 DT, NAU8325, and STM32"

* tag 'sound-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: amd: acp: update DMI quirk and add ACP DMIC for Lenovo platforms
  ASoC: SDCA: Unregister IRQ handlers on module remove
  ASoC: SDCA: mask Function_Status value
  ASoC: SDCA: Fix overwritten var within for loop
  ASoC: stm32_sai: fix incorrect BCLK polarity for DSP_A/B, LEFT_J
  ASoC: SOF: Intel: hda: modify period size constraints for ACE4
  ALSA: hda/intel: enforce stricter period-size alignment for Intel NVL
  ASoC: nau8325: Add software reset during probe
  Revert "ALSA: hda/realtek: Add quirk for Gigabyte Technology to fix headphone"
  ASoC: Intel: avs: Fix memory leak in avs_register_i2s_test_boards()
  ASoC: SOF: Intel: fix iteration in is_endpoint_present()
  ASoC: SOF: Intel: Fix endpoint index if endpoints are missing
  ASoC: SDCA: Fix errors in IRQ cleanup
  ASoC: amd: acp: add Lenovo P16s G5 AMD quirk for legacy SDW machine
  ASoC: dt-bindings: ti,tas2552: Add sound-dai-cells
  ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14IAH10
parents 4e1538b1 00afb181

Documentation/devicetree/bindings/sound/ti,tas2552.yaml

+10 −3
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ properties: 
    maxItems: 1

    description: gpio pin to enable/disable the device



  '#sound-dai-cells':

    const: 0



required:

  - compatible

  - reg
@@ -41,7 +44,10 @@ required: 
  - iovdd-supply

  - avdd-supply



additionalProperties: false

allOf:

  - $ref: dai-common.yaml#



unevaluatedProperties: false



examples:

  - |
@@ -54,6 +60,7 @@ examples: 
        audio-codec@41 {

            compatible = "ti,tas2552";

            reg = <0x41>;

            #sound-dai-cells = <0>;

            vbat-supply = <&reg_vbat>;

            iovdd-supply = <&reg_iovdd>;

            avdd-supply = <&reg_avdd>;

include/sound/sdca_interrupts.h

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ struct sdca_interrupt_info { 
int sdca_irq_request(struct device *dev, struct sdca_interrupt_info *interrupt_info,

		     int sdca_irq, const char *name, irq_handler_t handler,

		     void *data);

void sdca_irq_free(struct device *dev, struct sdca_interrupt_info *interrupt_info,

		   int sdca_irq, const char *name, void *data);

int sdca_irq_data_populate(struct device *dev, struct regmap *function_regmap,

			   struct snd_soc_component *component,

			   struct sdca_function_data *function,
@@ -81,6 +83,9 @@ int sdca_irq_populate_early(struct device *dev, struct regmap *function_regmap, 
int sdca_irq_populate(struct sdca_function_data *function,

		      struct snd_soc_component *component,

		      struct sdca_interrupt_info *info);

void sdca_irq_cleanup(struct device *dev,

		      struct sdca_function_data *function,

		      struct sdca_interrupt_info *info);

struct sdca_interrupt_info *sdca_irq_allocate(struct device *dev,

					      struct regmap *regmap, int irq);

sound/hda/codecs/realtek/alc269.c

+1 −0
Original line number Diff line number Diff line
@@ -7680,6 +7680,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x38fd, "ThinkBook plus Gen5 Hybrid", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x390d, "Lenovo Yoga Pro 7 14ASP10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),

	SND_PCI_QUIRK(0x17aa, 0x3911, "Lenovo Yoga Pro 7 14IAH10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),

	SND_PCI_QUIRK(0x17aa, 0x3913, "Lenovo 145", ALC236_FIXUP_LENOVO_INV_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x391a, "Lenovo Yoga Slim 7 14AKP10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),

	SND_PCI_QUIRK(0x17aa, 0x391f, "Yoga S990-16 pro Quad YC Quad", ALC287_FIXUP_TXNW2781_I2C),

sound/hda/codecs/realtek/alc662.c

+0 −9
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ enum { 
	ALC897_FIXUP_HEADSET_MIC_PIN2,

	ALC897_FIXUP_UNIS_H3C_X500S,

	ALC897_FIXUP_HEADSET_MIC_PIN3,

	ALC897_FIXUP_H610M_HP_PIN,

};



static const struct hda_fixup alc662_fixups[] = {
@@ -767,13 +766,6 @@ static const struct hda_fixup alc662_fixups[] = { 
			{ }

		},

	},

	[ALC897_FIXUP_H610M_HP_PIN] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x19, 0x0321403f }, /* HP out */

			{ }

		},

	},

};



static const struct hda_quirk alc662_fixup_tbl[] = {
@@ -823,7 +815,6 @@ static const struct hda_quirk alc662_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),

	SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),

	SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),

	SND_PCI_QUIRK(0x1458, 0xa194, "H610M H V2 DDR4", ALC897_FIXUP_H610M_HP_PIN),

	SND_PCI_QUIRK(0x14cd, 0x5003, "USI", ALC662_FIXUP_USI_HEADSET_MODE),

	SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC662_FIXUP_LENOVO_MULTI_CODECS),

	SND_PCI_QUIRK(0x17aa, 0x1057, "Lenovo P360", ALC897_FIXUP_HEADSET_MIC_PIN),

sound/hda/controllers/intel.c

+5 −2
Original line number Diff line number Diff line
@@ -295,6 +295,9 @@ enum { 
#define AZX_DCAPS_INTEL_LNL \

	(AZX_DCAPS_INTEL_SKYLAKE | AZX_DCAPS_PIO_COMMANDS)



#define AZX_DCAPS_INTEL_NVL \

	(AZX_DCAPS_INTEL_LNL & ~AZX_DCAPS_NO_ALIGN_BUFSIZE)



/* quirks for ATI SB / AMD Hudson */

#define AZX_DCAPS_PRESET_ATI_SB \

	(AZX_DCAPS_NO_TCSEL | AZX_DCAPS_POSFIX_LPIB |\
@@ -2565,8 +2568,8 @@ static const struct pci_device_id azx_ids[] = { 
	/* Wildcat Lake */

	{ PCI_DEVICE_DATA(INTEL, HDA_WCL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },

	/* Nova Lake */

	{ PCI_DEVICE_DATA(INTEL, HDA_NVL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },

	{ PCI_DEVICE_DATA(INTEL, HDA_NVL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },

	{ PCI_DEVICE_DATA(INTEL, HDA_NVL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_NVL) },

	{ PCI_DEVICE_DATA(INTEL, HDA_NVL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_NVL) },

	/* Apollolake (Broxton-P) */

	{ PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },

	/* Gemini-Lake */