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

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

Pull sound fixes from Takashi Iwai:
 "Likely the last pull request in 2025, again a collection of lots of
  small fixes. Most of them are various device-specific small fixes:

   - An ASoC core fix for correcting the clamping behavior of *_SX mixer
     elements

   - Various fixes for ASoC fsl, SOF, etc

   - Usual HD- and USB-audio quirks / fix-ups

   - A couple of error-handling fixes for legacy PCMCIA drivers"

* tag 'sound-6.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (35 commits)
  ALSA: hda/realtek: fix PCI SSID for one of the HP 200 G2i laptop
  ASoC: ops: fix snd_soc_get_volsw for sx controls
  ALSA: hda/realtek: Add Asus quirk for TAS amplifiers
  ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L63 with feedback
  ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L56 with feedback
  ASoC: fsl-asoc-card: Use of_property_present() for non-boolean properties
  ASoC: rt1320: update VC blind write settings
  ASoC: fsl_xcvr: provide regmap names
  ASoC: fsl_sai: Add missing registers to cache default
  ASoC: ak4458: remove the reset operation in probe and remove
  ASoC: fsl_asrc_dma: fix duplicate debugfs directory error
  ASoC: fsl_easrc: fix duplicate debugfs directory error
  ALSA: hda/realtek: fix micmute LED reversed on HP Abe and Bantie
  ALSA: hda/realtek: Add support for HP Clipper Laptop
  ALSA: hda/realtek: Add support for HP Trekker Laptop
  ALSA: usb-mixer: us16x08: validate meter packet indices
  ASoC: Intel: soc-acpi-intel-nvl-match: Drop rt722 l3 from the match table
  ASoC: soc-acpi / SOF: Add best_effort flag to get_function_tplg_files op
  ASoC: SOF: Intel: pci-mtl: Change the topology path to intel/sof-ipc4-tplg
  ASoC: SOF: ipc4-topology: set playback channel mask
  ...
parents b9275466 17753d17

include/sound/soc-acpi.h

+4 −1
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ struct snd_soc_acpi_link_adr { 
 *	@mach: the pointer of the machine driver

 *	@prefix: the prefix of the topology file name. Typically, it is the path.

 *	@tplg_files: the pointer of the array of the topology file names.

 *	@best_effort: ignore non supported links and try to build the card in best effort

 *		      with supported links

 */

/* Descriptor for SST ASoC machine driver */

struct snd_soc_acpi_mach {
@@ -224,7 +226,8 @@ struct snd_soc_acpi_mach { 
	const u32 tplg_quirk_mask;

	int (*get_function_tplg_files)(struct snd_soc_card *card,

				       const struct snd_soc_acpi_mach *mach,

				       const char *prefix, const char ***tplg_files);

				       const char *prefix, const char ***tplg_files,

				       bool best_effort);

};



#define SND_SOC_ACPI_MAX_CODECS 3

sound/hda/codecs/realtek/alc269.c

+26 −6
Original line number Diff line number Diff line
@@ -1656,6 +1656,18 @@ static void alc236_fixup_hp_mute_led_micmute_vref(struct hda_codec *codec, 
	alc236_fixup_hp_micmute_led_vref(codec, fix, action);

}



static void alc236_fixup_hp_mute_led_micmute_gpio(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{

	struct alc_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE)

		spec->micmute_led_polarity = 1;



	alc236_fixup_hp_mute_led_coefbit2(codec, fix, action);

	alc_fixup_hp_gpio_led(codec, action, 0x00, 0x01);

}



static inline void alc298_samsung_write_coef_pack(struct hda_codec *codec,

						  const unsigned short coefs[2])

{
@@ -3753,6 +3765,7 @@ enum { 
	ALC295_FIXUP_DELL_TAS2781_I2C,

	ALC245_FIXUP_TAS2781_SPI_2,

	ALC287_FIXUP_TXNW2781_I2C,

	ALC287_FIXUP_TXNW2781_I2C_ASUS,

	ALC287_FIXUP_YOGA7_14ARB7_I2C,

	ALC245_FIXUP_HP_MUTE_LED_COEFBIT,

	ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT,
@@ -5326,9 +5339,7 @@ static const struct hda_fixup alc269_fixups[] = { 
	},

	[ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc236_fixup_hp_mute_led_coefbit2,

		.chained = true,

		.chain_id = ALC236_FIXUP_HP_GPIO_LED,

		.v.func = alc236_fixup_hp_mute_led_micmute_gpio,

	},

	[ALC236_FIXUP_LENOVO_INV_DMIC] = {

		.type = HDA_FIXUP_FUNC,
@@ -6053,6 +6064,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK,

	},

	[ALC287_FIXUP_TXNW2781_I2C_ASUS] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = tas2781_fixup_txnw_i2c,

		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_SPK,

	},

	[ALC287_FIXUP_YOGA7_14ARB7_I2C] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = yoga7_14arb7_fixup_i2c,
@@ -6771,10 +6788,10 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8e61, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e62, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e8a, "HP NexusX", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8e9c, "HP 16 Clipper OmniBook X X360", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e9d, "HP 17 Turbine OmniBook X UMA", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e9e, "HP 17 Turbine OmniBook X UMA", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8eb6, "HP Abe A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8eb7, "HP Abe A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8eb8, "HP Abe A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8ec1, "HP 200 G2i", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8ec4, "HP Bantie I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
@@ -6790,11 +6807,13 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8eda, "HP ZBook Firefly 16W", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8ee4, "HP Bantie A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8ee5, "HP Bantie A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8ee7, "HP Abe A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8f0c, "HP ZBook X G2i 16W", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8f0e, "HP ZBook X G2i 16W", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8f40, "HP ZBook 8 G2a 14", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8f41, "HP ZBook 8 G2a 16", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8f42, "HP ZBook 8 G2a 14W", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8f57, "HP Trekker G7JC", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8f62, "HP ZBook 8 G2a 16W", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),

	SND_PCI_QUIRK(0x1043, 0x1032, "ASUS VivoBook X513EA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1034, "ASUS GU605C", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),
@@ -6827,8 +6846,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1314, "ASUS GA605K", ALC285_FIXUP_ASUS_GA605K_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1384, "ASUS RC73XA", ALC287_FIXUP_TXNW2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x1394, "ASUS RC73YA", ALC287_FIXUP_TXNW2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x1384, "ASUS RC73XA", ALC287_FIXUP_TXNW2781_I2C_ASUS),

	SND_PCI_QUIRK(0x1043, 0x1394, "ASUS RC73YA", ALC287_FIXUP_TXNW2781_I2C_ASUS),

	SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),

	SND_PCI_QUIRK(0x1043, 0x1433, "ASUS GX650PY/PZ/PV/PU/PYV/PZV/PIV/PVV", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),
@@ -7296,6 +7315,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC),

	SND_PCI_QUIRK(0x1e39, 0xca14, "MEDION NM14LNL", ALC233_FIXUP_MEDION_MTL_SPK),

	SND_PCI_QUIRK(0x1ee7, 0x2078, "HONOR BRB-X M1010", ALC2XX_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1f66, 0x0105, "Ayaneo Portable Game Player", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x2014, 0x800a, "Positivo ARN50", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

sound/hda/controllers/cix-ipbloq.c

+1 −3
Original line number Diff line number Diff line
@@ -115,10 +115,8 @@ static int cix_ipbloq_hda_init(struct cix_ipbloq_hda *hda, 
	bus->addr = res->start;



	irq_id = platform_get_irq(pdev, 0);

	if (irq_id < 0) {

		dev_err(hda->dev, "failed to get the irq, err = %d\n", irq_id);

	if (irq_id < 0)

		return irq_id;

	}



	err = devm_request_irq(hda->dev, irq_id, azx_interrupt,

			       0, KBUILD_MODNAME, chip);

sound/pcmcia/pdaudiocf/pdaudiocf.c

+7 −1
Original line number Diff line number Diff line
@@ -131,7 +131,13 @@ static int snd_pdacf_probe(struct pcmcia_device *link) 
	link->config_index = 1;

	link->config_regs = PRESENT_OPTION;



	return pdacf_config(link);

	err = pdacf_config(link);

	if (err < 0) {

		card_list[i] = NULL;

		snd_card_free(card);

		return err;

	}

	return 0;

}

sound/pcmcia/vx/vxpocket.c

+7 −1
Original line number Diff line number Diff line
@@ -284,7 +284,13 @@ static int vxpocket_probe(struct pcmcia_device *p_dev) 


	vxp->p_dev = p_dev;



	return vxpocket_config(p_dev);

	err = vxpocket_config(p_dev);

	if (err < 0) {

		card_alloc &= ~(1 << i);

		snd_card_free(card);

		return err;

	}

	return 0;

}



static void vxpocket_detach(struct pcmcia_device *link)