diff options
author | David Henningsson <david.henningsson@canonical.com> | 2015-12-15 08:44:03 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-12-15 08:52:02 -0500 |
commit | c04017ea81dc1eccae87be7ac7b82b2972f9931f (patch) | |
tree | 0064dd37c03f3221c1694879077be697bd28fb95 | |
parent | 12a6116e66695a728bcb9616416c508ce9c051a1 (diff) |
ALSA: hda - Fix headphone mic input on a few Dell ALC293 machines
These laptops support both headphone, headset and mic modes
for the 3.5mm jack.
Cc: stable@vger.kernel.org
BugLink: https://bugs.launchpad.net/bugs/1526330
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8dd2ac13b3af..b745a721c363 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -4606,6 +4606,7 @@ enum { | |||
4606 | ALC288_FIXUP_DISABLE_AAMIX, | 4606 | ALC288_FIXUP_DISABLE_AAMIX, |
4607 | ALC292_FIXUP_DELL_E7X, | 4607 | ALC292_FIXUP_DELL_E7X, |
4608 | ALC292_FIXUP_DISABLE_AAMIX, | 4608 | ALC292_FIXUP_DISABLE_AAMIX, |
4609 | ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK, | ||
4609 | ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, | 4610 | ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, |
4610 | ALC275_FIXUP_DELL_XPS, | 4611 | ALC275_FIXUP_DELL_XPS, |
4611 | ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE, | 4612 | ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE, |
@@ -5169,6 +5170,12 @@ static const struct hda_fixup alc269_fixups[] = { | |||
5169 | .chained = true, | 5170 | .chained = true, |
5170 | .chain_id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE | 5171 | .chain_id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE |
5171 | }, | 5172 | }, |
5173 | [ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK] = { | ||
5174 | .type = HDA_FIXUP_FUNC, | ||
5175 | .v.func = alc_fixup_disable_aamix, | ||
5176 | .chained = true, | ||
5177 | .chain_id = ALC293_FIXUP_DELL1_MIC_NO_PRESENCE | ||
5178 | }, | ||
5172 | [ALC292_FIXUP_DELL_E7X] = { | 5179 | [ALC292_FIXUP_DELL_E7X] = { |
5173 | .type = HDA_FIXUP_FUNC, | 5180 | .type = HDA_FIXUP_FUNC, |
5174 | .v.func = alc_fixup_dell_xps13, | 5181 | .v.func = alc_fixup_dell_xps13, |
@@ -5247,11 +5254,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { | |||
5247 | SND_PCI_QUIRK(0x1028, 0x06c7, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE), | 5254 | SND_PCI_QUIRK(0x1028, 0x06c7, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE), |
5248 | SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), | 5255 | SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), |
5249 | SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), | 5256 | SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), |
5250 | SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC292_FIXUP_DISABLE_AAMIX), | 5257 | SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), |
5251 | SND_PCI_QUIRK(0x1028, 0x06dd, "Dell", ALC292_FIXUP_DISABLE_AAMIX), | 5258 | SND_PCI_QUIRK(0x1028, 0x06dd, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), |
5252 | SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC292_FIXUP_DISABLE_AAMIX), | 5259 | SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), |
5253 | SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC292_FIXUP_DISABLE_AAMIX), | 5260 | SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), |
5254 | SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC292_FIXUP_DISABLE_AAMIX), | 5261 | SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), |
5255 | SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE), | 5262 | SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE), |
5256 | SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), | 5263 | SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), |
5257 | SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), | 5264 | SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), |