| From c04017ea81dc1eccae87be7ac7b82b2972f9931f Mon Sep 17 00:00:00 2001 |
| From: David Henningsson <david.henningsson@canonical.com> |
| Date: Tue, 15 Dec 2015 14:44:03 +0100 |
| Subject: ALSA: hda - Fix headphone mic input on a few Dell ALC293 machines |
| |
| From: David Henningsson <david.henningsson@canonical.com> |
| |
| commit c04017ea81dc1eccae87be7ac7b82b2972f9931f upstream. |
| |
| These laptops support both headphone, headset and mic modes |
| for the 3.5mm jack. |
| |
| BugLink: https://bugs.launchpad.net/bugs/1526330 |
| 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 | 17 ++++++++++++----- |
| 1 file changed, 12 insertions(+), 5 deletions(-) |
| |
| --- a/sound/pci/hda/patch_realtek.c |
| +++ b/sound/pci/hda/patch_realtek.c |
| @@ -4605,6 +4605,7 @@ enum { |
| ALC288_FIXUP_DISABLE_AAMIX, |
| ALC292_FIXUP_DELL_E7X, |
| ALC292_FIXUP_DISABLE_AAMIX, |
| + ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK, |
| ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, |
| ALC275_FIXUP_DELL_XPS, |
| ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE, |
| @@ -5168,6 +5169,12 @@ static const struct hda_fixup alc269_fix |
| .chained = true, |
| .chain_id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE |
| }, |
| + [ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK] = { |
| + .type = HDA_FIXUP_FUNC, |
| + .v.func = alc_fixup_disable_aamix, |
| + .chained = true, |
| + .chain_id = ALC293_FIXUP_DELL1_MIC_NO_PRESENCE |
| + }, |
| [ALC292_FIXUP_DELL_E7X] = { |
| .type = HDA_FIXUP_FUNC, |
| .v.func = alc_fixup_dell_xps13, |
| @@ -5246,11 +5253,11 @@ static const struct snd_pci_quirk alc269 |
| SND_PCI_QUIRK(0x1028, 0x06c7, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE), |
| SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), |
| SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), |
| - SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC292_FIXUP_DISABLE_AAMIX), |
| - SND_PCI_QUIRK(0x1028, 0x06dd, "Dell", ALC292_FIXUP_DISABLE_AAMIX), |
| - SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC292_FIXUP_DISABLE_AAMIX), |
| - SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC292_FIXUP_DISABLE_AAMIX), |
| - SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC292_FIXUP_DISABLE_AAMIX), |
| + SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), |
| + SND_PCI_QUIRK(0x1028, 0x06dd, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), |
| + SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), |
| + SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), |
| + SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), |
| SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE), |
| SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), |
| SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), |