| From ec56af67a10a0d82b79027878a81fce08d002d50 Mon Sep 17 00:00:00 2001 |
| From: David Henningsson <david.henningsson@canonical.com> |
| Date: Wed, 24 Jun 2015 10:46:33 +0200 |
| Subject: ALSA: hda - Fix Dock Headphone on Thinkpad X250 seen as a Line Out |
| |
| From: David Henningsson <david.henningsson@canonical.com> |
| |
| commit ec56af67a10a0d82b79027878a81fce08d002d50 upstream. |
| |
| Thinkpad X250, when attached to a dock, has two headphone outs but |
| no line out. Make sure we don't try to turn this into one headphone |
| and one line out (since that disables the headphone amp on the dock). |
| |
| Alsa-info at http://www.alsa-project.org/db/?f=36f8764e1d782397928feec715d0ef90dfddd4c1 |
| |
| Signed-off-by: David Henningsson <david.henningsson@canonical.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/pci/hda/patch_realtek.c | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| --- a/sound/pci/hda/patch_realtek.c |
| +++ b/sound/pci/hda/patch_realtek.c |
| @@ -4421,6 +4421,7 @@ enum { |
| ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC, |
| ALC293_FIXUP_DELL1_MIC_NO_PRESENCE, |
| ALC292_FIXUP_TPT440_DOCK, |
| + ALC292_FIXUP_TPT440_DOCK2, |
| ALC283_FIXUP_BXBT2807_MIC, |
| ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED, |
| ALC282_FIXUP_ASPIRE_V5_PINS, |
| @@ -4864,6 +4865,12 @@ static const struct hda_fixup alc269_fix |
| .chain_id = ALC269_FIXUP_HEADSET_MODE |
| }, |
| [ALC292_FIXUP_TPT440_DOCK] = { |
| + .type = HDA_FIXUP_FUNC, |
| + .v.func = alc269_fixup_pincfg_no_hp_to_lineout, |
| + .chained = true, |
| + .chain_id = ALC292_FIXUP_TPT440_DOCK2 |
| + }, |
| + [ALC292_FIXUP_TPT440_DOCK2] = { |
| .type = HDA_FIXUP_PINS, |
| .v.pins = (const struct hda_pintbl[]) { |
| { 0x16, 0x21211010 }, /* dock headphone */ |