Commit 6b571e26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more sound fixes from Takashi Iwai:
 "The remaining fixes for 6.9-rc1 that have been gathered in this week.

  More about ASoC at this time (one long-standing fix for compress
  offload, SOF, AMD ACP, Rockchip, Cirrus and tlv320 stuff) while
  another regression fix in ALSA core and a couple of HD-audio quirks as
  usual are included"

* tag 'sound-fix2-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: control: Fix unannotated kfree() cleanup
  ALSA: hda/realtek: Add quirks for some Clevo laptops
  ALSA: hda/realtek: Add quirk for HP Spectre x360 14 eu0000
  ALSA: hda/realtek: fix the hp playback volume issue for LG machines
  ASoC: soc-compress: Fix and add DPCM locking
  ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED
  ASoC: SOF: amd: Move signed_fw_image to struct acp_quirk_entry
  ASoC: amd: yc: Revert "add new YC platform variant (0x63) support"
  ASoC: amd: yc: Revert "Fix non-functional mic on Lenovo 21J2"
  ASoC: soc-core.c: Skip dummy codec when adding platforms
  ASoC: rockchip: i2s-tdm: Fix inaccurate sampling rates
  ASoC: dt-bindings: cirrus,cs42l43: Fix 'gpio-ranges' schema
  ASoC: amd: yc: Fix non-functional mic on ASUS M7600RE
  ASoC: tlv320adc3xxx: Don't strip remove function when driver is builtin
parents 5ee2433f 9f234784

Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml

+6 −5
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ properties: 


      gpio-ranges:

        items:

          - items:

              - description: A phandle to the CODEC pinctrl node

                minimum: 0

              - const: 0

sound/core/control.c

+2 −2
Original line number Diff line number Diff line
@@ -1275,12 +1275,12 @@ static int snd_ctl_elem_read(struct snd_card *card, 
static int snd_ctl_elem_read_user(struct snd_card *card,

				  struct snd_ctl_elem_value __user *_control)

{

	struct snd_ctl_elem_value *control;

	struct snd_ctl_elem_value *control __free(kfree) = NULL;

	int result;



	control = memdup_user(_control, sizeof(*control));

	if (IS_ERR(control))

		return PTR_ERR(control);

		return PTR_ERR(no_free_ptr(control));



	result = snd_ctl_elem_read(card, control);

	if (result < 0)

sound/pci/hda/patch_realtek.c

+67 −1
Original line number Diff line number Diff line
@@ -2645,6 +2645,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1558, 0x65f1, "Clevo PC50HS", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x65f5, "Clevo PD50PN[NRT]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x66a2, "Clevo PE60RNE", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x66a6, "Clevo PE60SN[CDE]-[GS]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x67d1, "Clevo PB71[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x67e1, "Clevo PB71[DE][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),

	SND_PCI_QUIRK(0x1558, 0x67e5, "Clevo PC70D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
@@ -6964,6 +6965,25 @@ static void alc256_fixup_mic_no_presence_and_resume(struct hda_codec *codec, 
	}

}



static void alc256_decrease_headphone_amp_val(struct hda_codec *codec,

					      const struct hda_fixup *fix, int action)

{

	u32 caps;

	u8 nsteps, offs;



	if (action != HDA_FIXUP_ACT_PRE_PROBE)

		return;



	caps = query_amp_caps(codec, 0x3, HDA_OUTPUT);

	nsteps = ((caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT) - 10;

	offs = ((caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT) - 10;

	caps &= ~AC_AMPCAP_NUM_STEPS & ~AC_AMPCAP_OFFSET;

	caps |= (nsteps << AC_AMPCAP_NUM_STEPS_SHIFT) | (offs << AC_AMPCAP_OFFSET_SHIFT);



	if (snd_hda_override_amp_caps(codec, 0x3, HDA_OUTPUT, caps))

		codec_warn(codec, "failed to override amp caps for NID 0x3\n");

}



static void alc_fixup_dell4_mic_no_presence_quiet(struct hda_codec *codec,

						  const struct hda_fixup *fix,

						  int action)
@@ -7104,6 +7124,38 @@ static void alc_fixup_headset_mic(struct hda_codec *codec, 
	}

}



static void alc245_fixup_hp_spectre_x360_eu0xxx(struct hda_codec *codec,

					  const struct hda_fixup *fix, int action)

{

	/*

	 * The Pin Complex 0x14 for the treble speakers is wrongly reported as

	 * unconnected.

	 * The Pin Complex 0x17 for the bass speakers has the lowest association

	 * and sequence values so shift it up a bit to squeeze 0x14 in.

	 */

	static const struct hda_pintbl pincfgs[] = {

		{ 0x14, 0x90170110 }, // top/treble

		{ 0x17, 0x90170111 }, // bottom/bass

		{ }

	};



	/*

	 * Force DAC 0x02 for the bass speakers 0x17.

	 */

	static const hda_nid_t conn[] = { 0x02 };



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		snd_hda_apply_pincfgs(codec, pincfgs);

		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);

		break;

	}



	cs35l41_fixup_i2c_two(codec, fix, action);

	alc245_fixup_hp_mute_led_coefbit(codec, fix, action);

	alc245_fixup_hp_gpio_led(codec, fix, action);

}





enum {

	ALC269_FIXUP_GPIO2,
@@ -7382,6 +7434,8 @@ enum { 
	ALC294_FIXUP_CS35L41_I2C_2,

	ALC245_FIXUP_CS35L56_SPI_4_HP_GPIO_LED,

	ALC256_FIXUP_ACER_SFG16_MICMUTE_LED,

	ALC256_FIXUP_HEADPHONE_AMP_VOL,

	ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX,

};



/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -9581,6 +9635,14 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc256_fixup_acer_sfg16_micmute_led,

	},

	[ALC256_FIXUP_HEADPHONE_AMP_VOL] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc256_decrease_headphone_amp_val,

	},

	[ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc245_fixup_hp_spectre_x360_eu0xxx,

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -9944,7 +10006,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8be8, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8be9, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bf0, "HP", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c15, "HP Spectre 14", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8c15, "HP Spectre x360 2-in-1 Laptop 14-eu0xxx", ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX),

	SND_PCI_QUIRK(0x103c, 0x8c16, "HP Spectre 16", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8c17, "HP Spectre 16", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8c46, "HP EliteBook 830 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
@@ -10115,12 +10177,14 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x152d, 0x1082, "Quanta NL3", ALC269_FIXUP_LIFEBOOK),

	SND_PCI_QUIRK(0x1558, 0x0353, "Clevo V35[05]SN[CDE]Q", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x1323, "Clevo N130ZU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x1325, "Clevo N15[01][CW]U", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x1401, "Clevo L140[CZ]U", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x1403, "Clevo N140CU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x1404, "Clevo N150CU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x14a1, "Clevo L141MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x2624, "Clevo L240TU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x4018, "Clevo NV40M[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x4019, "Clevo NV40MZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x4020, "Clevo NV40MB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10319,6 +10383,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x9e56, "Lenovo ZhaoYang CF4620Z", ALC286_FIXUP_SONY_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1849, 0x1233, "ASRock NUC Box 1100", ALC233_FIXUP_NO_AUDIO_JACK),

	SND_PCI_QUIRK(0x1849, 0xa233, "Positivo Master C6300", ALC269_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1854, 0x0440, "LG CQ6", ALC256_FIXUP_HEADPHONE_AMP_VOL),

	SND_PCI_QUIRK(0x1854, 0x0441, "LG CQ6 AIO", ALC256_FIXUP_HEADPHONE_AMP_VOL),

	SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS),

	SND_PCI_QUIRK(0x19e5, 0x320f, "Huawei WRT-WX9 ", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1b35, 0x1235, "CZC B20", ALC269_FIXUP_CZC_B20),

sound/soc/amd/yc/acp6x-mach.c

+7 −7
Original line number Diff line number Diff line
@@ -199,13 +199,6 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "21HY"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "21J2"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {
@@ -318,6 +311,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "E1504FA"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "M7600RE"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/amd/yc/pci-acp6x.c

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static int snd_acp6x_probe(struct pci_dev *pci, 
	/* Yellow Carp device check */

	switch (pci->revision) {

	case 0x60:

	case 0x63:

	case 0x6f:

		break;

	default: