Skip to content

Commit f7b069c

Browse files
Vitaly Rodionovtiwai
authored andcommitted
ALSA: hda/realtek: Fix generic fixup definition for cs35l41 amp
Generic fixup for CS35L41 amplifies should not have vendor specific chained fixup. For ThinkPad laptops with led issue, we can just add specific fixup. Fixes: a6ac60b (ALSA: hda/realtek: Fix mute led issue on thinkpad with cs35l41 s-codec) Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com> Link: https://lore.kernel.org/r/20230720082022.13033-1-vitalyr@opensource.cirrus.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 0659400 commit f7b069c

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

sound/pci/hda/patch_realtek.c

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7230,6 +7230,7 @@ enum {
72307230
ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN,
72317231
ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS,
72327232
ALC236_FIXUP_DELL_DUAL_CODECS,
7233+
ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,
72337234
};
72347235

72357236
/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -9166,8 +9167,6 @@ static const struct hda_fixup alc269_fixups[] = {
91669167
[ALC287_FIXUP_CS35L41_I2C_2] = {
91679168
.type = HDA_FIXUP_FUNC,
91689169
.v.func = cs35l41_fixup_i2c_two,
9169-
.chained = true,
9170-
.chain_id = ALC269_FIXUP_THINKPAD_ACPI,
91719170
},
91729171
[ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED] = {
91739172
.type = HDA_FIXUP_FUNC,
@@ -9304,6 +9303,12 @@ static const struct hda_fixup alc269_fixups[] = {
93049303
.chained = true,
93059304
.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
93069305
},
9306+
[ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI] = {
9307+
.type = HDA_FIXUP_FUNC,
9308+
.v.func = cs35l41_fixup_i2c_two,
9309+
.chained = true,
9310+
.chain_id = ALC269_FIXUP_THINKPAD_ACPI,
9311+
},
93079312
};
93089313

93099314
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -9833,14 +9838,14 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
98339838
SND_PCI_QUIRK(0x17aa, 0x22be, "Thinkpad X1 Carbon 8th", ALC285_FIXUP_THINKPAD_HEADSET_JACK),
98349839
SND_PCI_QUIRK(0x17aa, 0x22c1, "Thinkpad P1 Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK),
98359840
SND_PCI_QUIRK(0x17aa, 0x22c2, "Thinkpad X1 Extreme Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK),
9836-
SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2),
9837-
SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2),
9838-
SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2),
9839-
SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_CS35L41_I2C_2),
9840-
SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_CS35L41_I2C_2),
9841-
SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
9842-
SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
9843-
SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
9841+
SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),
9842+
SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),
9843+
SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),
9844+
SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),
9845+
SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),
9846+
SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),
9847+
SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),
9848+
SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),
98449849
SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
98459850
SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
98469851
SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),

0 commit comments

Comments
 (0)