diff options
author | Hui Wang <hui.wang@canonical.com> | 2014-07-29 23:11:48 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-07-30 01:22:23 -0400 |
commit | 7440850c20b69658f322119d20a94dc914127cc7 (patch) | |
tree | dbdf35d978d0be13be9e62ce37eea8b741685b4b | |
parent | eb12f72ee7245ca207818b9efd10be2641494502 (diff) |
ALSA: hda - fix an external mic jack problem on a HP machine
ON the machine, two pin complex (0xb and 0xe) are both routed to
the same external right-side mic jack, this makes the jack can't work.
To fix this problem, set the 0xe to "not connected".
BugLink: https://bugs.launchpad.net/bugs/1350148
Tested-by: Franz Hsieh <franz.hsieh@canonical.com>
Cc: stable@vger.kernel.org
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 3744ea4e843d..4d3a3b932690 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -84,6 +84,7 @@ enum { | |||
84 | STAC_DELL_EQ, | 84 | STAC_DELL_EQ, |
85 | STAC_ALIENWARE_M17X, | 85 | STAC_ALIENWARE_M17X, |
86 | STAC_92HD89XX_HP_FRONT_JACK, | 86 | STAC_92HD89XX_HP_FRONT_JACK, |
87 | STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK, | ||
87 | STAC_92HD73XX_MODELS | 88 | STAC_92HD73XX_MODELS |
88 | }; | 89 | }; |
89 | 90 | ||
@@ -1809,6 +1810,11 @@ static const struct hda_pintbl stac92hd89xx_hp_front_jack_pin_configs[] = { | |||
1809 | {} | 1810 | {} |
1810 | }; | 1811 | }; |
1811 | 1812 | ||
1813 | static const struct hda_pintbl stac92hd89xx_hp_z1_g2_right_mic_jack_pin_configs[] = { | ||
1814 | { 0x0e, 0x400000f0 }, | ||
1815 | {} | ||
1816 | }; | ||
1817 | |||
1812 | static void stac92hd73xx_fixup_ref(struct hda_codec *codec, | 1818 | static void stac92hd73xx_fixup_ref(struct hda_codec *codec, |
1813 | const struct hda_fixup *fix, int action) | 1819 | const struct hda_fixup *fix, int action) |
1814 | { | 1820 | { |
@@ -1931,6 +1937,10 @@ static const struct hda_fixup stac92hd73xx_fixups[] = { | |||
1931 | [STAC_92HD89XX_HP_FRONT_JACK] = { | 1937 | [STAC_92HD89XX_HP_FRONT_JACK] = { |
1932 | .type = HDA_FIXUP_PINS, | 1938 | .type = HDA_FIXUP_PINS, |
1933 | .v.pins = stac92hd89xx_hp_front_jack_pin_configs, | 1939 | .v.pins = stac92hd89xx_hp_front_jack_pin_configs, |
1940 | }, | ||
1941 | [STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK] = { | ||
1942 | .type = HDA_FIXUP_PINS, | ||
1943 | .v.pins = stac92hd89xx_hp_z1_g2_right_mic_jack_pin_configs, | ||
1934 | } | 1944 | } |
1935 | }; | 1945 | }; |
1936 | 1946 | ||
@@ -1991,6 +2001,8 @@ static const struct snd_pci_quirk stac92hd73xx_fixup_tbl[] = { | |||
1991 | "Alienware M17x", STAC_ALIENWARE_M17X), | 2001 | "Alienware M17x", STAC_ALIENWARE_M17X), |
1992 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490, | 2002 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490, |
1993 | "Alienware M17x R3", STAC_DELL_EQ), | 2003 | "Alienware M17x R3", STAC_DELL_EQ), |
2004 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1927, | ||
2005 | "HP Z1 G2", STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK), | ||
1994 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17, | 2006 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17, |
1995 | "unknown HP", STAC_92HD89XX_HP_FRONT_JACK), | 2007 | "unknown HP", STAC_92HD89XX_HP_FRONT_JACK), |
1996 | {} /* terminator */ | 2008 | {} /* terminator */ |