aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHui Wang2018-01-29 00:23:15 -0600
committerGreg Kroah-Hartman2018-02-22 08:45:00 -0600
commitbc4c681fcaff86d73fe2dbda87be835d640dfa6f (patch)
treeb85bcaf868c4086a05d0601ed4015e3746e863d6
parent87dc89fc6127643d29fb9606600eb92be41704fb (diff)
downloadkernel-omap-bc4c681fcaff86d73fe2dbda87be835d640dfa6f.tar.gz
kernel-omap-bc4c681fcaff86d73fe2dbda87be835d640dfa6f.tar.xz
kernel-omap-bc4c681fcaff86d73fe2dbda87be835d640dfa6f.zip
ALSA: hda - Fix headset mic detection problem for two Dell machines
commit 3f2f7c553d077be6a30cb96b2976a2c940bf5335 upstream. One of them has the codec of alc256 and the other one has the codec of alc289. Cc: <stable@vger.kernel.org> Signed-off-by: Hui Wang <hui.wang@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/pci/hda/patch_realtek.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f14c1f288443..b6427ff9a211 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5976,6 +5976,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
5976 {0x14, 0x90170110}, 5976 {0x14, 0x90170110},
5977 {0x21, 0x02211020}), 5977 {0x21, 0x02211020}),
5978 SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, 5978 SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5979 {0x12, 0x90a60130},
5980 {0x14, 0x90170110},
5981 {0x14, 0x01011020},
5982 {0x21, 0x0221101f}),
5983 SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5979 ALC256_STANDARD_PINS), 5984 ALC256_STANDARD_PINS),
5980 SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, 5985 SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,
5981 {0x12, 0x90a60130}, 5986 {0x12, 0x90a60130},
@@ -6031,6 +6036,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
6031 {0x12, 0x90a60120}, 6036 {0x12, 0x90a60120},
6032 {0x14, 0x90170110}, 6037 {0x14, 0x90170110},
6033 {0x21, 0x0321101f}), 6038 {0x21, 0x0321101f}),
6039 SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
6040 {0x12, 0xb7a60130},
6041 {0x14, 0x90170110},
6042 {0x21, 0x04211020}),
6034 SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1, 6043 SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
6035 ALC290_STANDARD_PINS, 6044 ALC290_STANDARD_PINS,
6036 {0x15, 0x04211040}, 6045 {0x15, 0x04211040},