]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ALSA: hda - Add dock support for ThinkPad X260
authorConrad Kostecki <ck+linuxkernel@bl4ckb0x.de>
Fri, 2 Dec 2016 21:16:34 +0000 (13:16 -0800)
committerDhaval Giani <dhaval.giani@oracle.com>
Fri, 20 Jan 2017 22:21:50 +0000 (17:21 -0500)
Orabug: 25227139

[ Upstream commit 037e119738120c1cdc460c6ae33871c3000531f3 ]

Fixes audio output on a ThinkPad X260, when using Lenovo CES 2013
docking station series (basic, pro, ultra).

Signed-off-by: Conrad Kostecki <ck+linuxkernel@bl4ckb0x.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 2519c9fc644c0fc14c54518bab9440765e0ea99a)

Conflicts:

sound/pci/hda/patch_realtek.c

Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
sound/pci/hda/patch_realtek.c

index bd8c3818b7903fe54963a558c74746aa129a65cf..9cade089177a0da9c16024d8fa546678736a3599 100644 (file)
@@ -5244,6 +5244,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
        SND_PCI_QUIRK(0x17aa, 0x5034, "Thinkpad T450", ALC292_FIXUP_TPT440_DOCK),
        SND_PCI_QUIRK(0x17aa, 0x5036, "Thinkpad T450s", ALC292_FIXUP_TPT440_DOCK),
        SND_PCI_QUIRK(0x17aa, 0x503c, "Thinkpad L450", ALC292_FIXUP_TPT440_DOCK),
+       SND_PCI_QUIRK(0x17aa, 0x504a, "ThinkPad X260", ALC292_FIXUP_TPT440_DOCK),
        SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
        SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
        SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),