Commit 6639a3f6 authored by Kailang Yang's avatar Kailang Yang Committed by Zheng Zengkai
Browse files

ALSA: hda/realtek: Add support dual speaker for Dell 

stable inclusion
from stable-v6.6.2
commit 630ee9bcaef65b7caa64fbe75585ace81261d5a5
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8IW7G

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=630ee9bcaef65b7caa64fbe75585ace81261d5a5



--------------------------------

[ Upstream commit f0d9da19d7de9e845e7a93a901c4b9658df6b492 ]

Dell new platform support dual speaker. But BIOS verb table only show one speaker.
It will fill verb table for second speaker. Then bind with CS AMP model.

Fixes: de90f516 ("ALSA: hda/realtek: Add support for DELL Oasis 13/14/16 laptops")
Signed-off-by: default avatarKailang Yang <kailang@realtek.com>
Link: https://lore.kernel.org/r/4dd390a77bf742b8a518ac2deee00b0f@realtek.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent cdbefe29

sound/pci/hda/patch_realtek.c

+33 −7
Original line number Diff line number Diff line
@@ -7262,8 +7262,10 @@ enum { 
	ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,

	ALC299_FIXUP_PREDATOR_SPK,

	ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE,

	ALC289_FIXUP_DELL_SPK1,

	ALC289_FIXUP_DELL_SPK2,

	ALC289_FIXUP_DUAL_SPK,

	ALC289_FIXUP_RTK_AMP_DUAL_SPK,

	ALC294_FIXUP_SPK2_TO_DAC1,

	ALC294_FIXUP_ASUS_DUAL_SPK,

	ALC285_FIXUP_THINKPAD_X1_GEN7,
@@ -7363,6 +7365,7 @@ enum { 
	ALC287_FIXUP_THINKPAD_I2S_SPK,

	ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD,

	ALC2XX_FIXUP_HEADSET_MIC,

	ALC289_FIXUP_DELL_CS35L41_SPI_2,

};



/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -8589,6 +8592,15 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE

	},

	[ALC289_FIXUP_DELL_SPK1] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x14, 0x90170140 },

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE

	},

	[ALC289_FIXUP_DELL_SPK2] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -8604,6 +8616,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC289_FIXUP_DELL_SPK2

	},

	[ALC289_FIXUP_RTK_AMP_DUAL_SPK] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_speaker2_to_dac1,

		.chained = true,

		.chain_id = ALC289_FIXUP_DELL_SPK1

	},

	[ALC294_FIXUP_SPK2_TO_DAC1] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_speaker2_to_dac1,
@@ -9471,6 +9489,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_headset_mic,

	},

	[ALC289_FIXUP_DELL_CS35L41_SPI_2] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = cs35l41_fixup_spi_two,

		.chained = true,

		.chain_id = ALC289_FIXUP_DUAL_SPK

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -9581,13 +9605,15 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0c1c, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS),

	SND_PCI_QUIRK(0x1028, 0x0c1d, "Dell Precision 3440", ALC236_FIXUP_DELL_DUAL_CODECS),

	SND_PCI_QUIRK(0x1028, 0x0c1e, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS),

	SND_PCI_QUIRK(0x1028, 0x0cbd, "Dell Oasis 13 CS MTL-U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbe, "Dell Oasis 13 2-IN-1 MTL-U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbf, "Dell Oasis 13 Low Weight MTU-L", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc1, "Dell Oasis 14 MTL-H/U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc2, "Dell Oasis 14 2-in-1 MTL-H/U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc3, "Dell Oasis 14 Low Weight MTL-U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc4, "Dell Oasis 16 MTL-H/U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbd, "Dell Oasis 13 CS MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbe, "Dell Oasis 13 2-IN-1 MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbf, "Dell Oasis 13 Low Weight MTU-L", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc0, "Dell Oasis 13", ALC289_FIXUP_RTK_AMP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x0cc1, "Dell Oasis 14 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc2, "Dell Oasis 14 2-in-1 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc3, "Dell Oasis 14 Low Weight MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc4, "Dell Oasis 16 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc5, "Dell Oasis 14", ALC289_FIXUP_RTK_AMP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),