diff options
author | Sven Eckelmann <sven@narfation.org> | 2016-04-11 10:55:26 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-04-11 11:13:04 -0400 |
commit | c636b95ec5980345674ad7960a3c67135a84b687 (patch) | |
tree | ce283aafad9c07cc82b1bb0e4a33adf692fc8fcd | |
parent | dc5027a72369f4979a48d628ddebeeb974b7eb37 (diff) |
ALSA: hda/realtek - Enable the ALC292 dock fixup on the Thinkpad T460s
The Lenovo Thinkpad T460s requires the alc_fixup_tpt440_dock as well in
order to get working sound output on the docking stations headphone jack.
Patch tested on a Thinkpad T460s (20F9CT01WW) using a ThinkPad Ultradock
on kernel 4.4.6.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Tested-by: Simon Wunderlich <sw@simonwunderlich.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index fefe83f2beab..1402ba954b3d 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -4760,6 +4760,7 @@ enum { | |||
4760 | ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, | 4760 | ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, |
4761 | ALC280_FIXUP_HP_HEADSET_MIC, | 4761 | ALC280_FIXUP_HP_HEADSET_MIC, |
4762 | ALC221_FIXUP_HP_FRONT_MIC, | 4762 | ALC221_FIXUP_HP_FRONT_MIC, |
4763 | ALC292_FIXUP_TPT460, | ||
4763 | }; | 4764 | }; |
4764 | 4765 | ||
4765 | static const struct hda_fixup alc269_fixups[] = { | 4766 | static const struct hda_fixup alc269_fixups[] = { |
@@ -5409,6 +5410,12 @@ static const struct hda_fixup alc269_fixups[] = { | |||
5409 | { } | 5410 | { } |
5410 | }, | 5411 | }, |
5411 | }, | 5412 | }, |
5413 | [ALC292_FIXUP_TPT460] = { | ||
5414 | .type = HDA_FIXUP_FUNC, | ||
5415 | .v.func = alc_fixup_tpt440_dock, | ||
5416 | .chained = true, | ||
5417 | .chain_id = ALC293_FIXUP_LENOVO_SPK_NOISE, | ||
5418 | }, | ||
5412 | }; | 5419 | }; |
5413 | 5420 | ||
5414 | static const struct snd_pci_quirk alc269_fixup_tbl[] = { | 5421 | static const struct snd_pci_quirk alc269_fixup_tbl[] = { |
@@ -5563,7 +5570,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { | |||
5563 | SND_PCI_QUIRK(0x17aa, 0x2218, "Thinkpad X1 Carbon 2nd", ALC292_FIXUP_TPT440_DOCK), | 5570 | SND_PCI_QUIRK(0x17aa, 0x2218, "Thinkpad X1 Carbon 2nd", ALC292_FIXUP_TPT440_DOCK), |
5564 | SND_PCI_QUIRK(0x17aa, 0x2223, "ThinkPad T550", ALC292_FIXUP_TPT440_DOCK), | 5571 | SND_PCI_QUIRK(0x17aa, 0x2223, "ThinkPad T550", ALC292_FIXUP_TPT440_DOCK), |
5565 | SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK), | 5572 | SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK), |
5566 | SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE), | 5573 | SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460), |
5567 | SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), | 5574 | SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), |
5568 | SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), | 5575 | SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), |
5569 | SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), | 5576 | SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), |
@@ -5658,6 +5665,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { | |||
5658 | {.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"}, | 5665 | {.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"}, |
5659 | {.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"}, | 5666 | {.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"}, |
5660 | {.id = ALC292_FIXUP_TPT440, .name = "tpt440"}, | 5667 | {.id = ALC292_FIXUP_TPT440, .name = "tpt440"}, |
5668 | {.id = ALC292_FIXUP_TPT460, .name = "tpt460"}, | ||
5661 | {} | 5669 | {} |
5662 | }; | 5670 | }; |
5663 | #define ALC225_STANDARD_PINS \ | 5671 | #define ALC225_STANDARD_PINS \ |