diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-11 11:05:19 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-03-11 11:05:19 -0400 |
commit | ddb6ca75b5671b8fbf1909bc588c449ee74b34f9 (patch) | |
tree | e60af47fed428a03e38e2349191dea6d6e294db2 /sound | |
parent | 59294a01d7037f63fb8bf994af10ce63c618770a (diff) |
ALSA: hda - Fix built-in mic on Compaq Presario CQ60
Compaq Presario CQ60 laptop with CX20561 gives a wrong pin for the
built-in mic NID 0x17 instead of NID 0x1d, and it results in the
non-working mic. This patch just remaps the pin correctly via fixup.
Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=920604
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_conexant.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index fd3ed18670e9..da67ea8645a6 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
@@ -223,6 +223,7 @@ enum { | |||
223 | CXT_PINCFG_LENOVO_TP410, | 223 | CXT_PINCFG_LENOVO_TP410, |
224 | CXT_PINCFG_LEMOTE_A1004, | 224 | CXT_PINCFG_LEMOTE_A1004, |
225 | CXT_PINCFG_LEMOTE_A1205, | 225 | CXT_PINCFG_LEMOTE_A1205, |
226 | CXT_PINCFG_COMPAQ_CQ60, | ||
226 | CXT_FIXUP_STEREO_DMIC, | 227 | CXT_FIXUP_STEREO_DMIC, |
227 | CXT_FIXUP_INC_MIC_BOOST, | 228 | CXT_FIXUP_INC_MIC_BOOST, |
228 | CXT_FIXUP_HEADPHONE_MIC_PIN, | 229 | CXT_FIXUP_HEADPHONE_MIC_PIN, |
@@ -660,6 +661,15 @@ static const struct hda_fixup cxt_fixups[] = { | |||
660 | .type = HDA_FIXUP_PINS, | 661 | .type = HDA_FIXUP_PINS, |
661 | .v.pins = cxt_pincfg_lemote, | 662 | .v.pins = cxt_pincfg_lemote, |
662 | }, | 663 | }, |
664 | [CXT_PINCFG_COMPAQ_CQ60] = { | ||
665 | .type = HDA_FIXUP_PINS, | ||
666 | .v.pins = (const struct hda_pintbl[]) { | ||
667 | /* 0x17 was falsely set up as a mic, it should 0x1d */ | ||
668 | { 0x17, 0x400001f0 }, | ||
669 | { 0x1d, 0x97a70120 }, | ||
670 | { } | ||
671 | } | ||
672 | }, | ||
663 | [CXT_FIXUP_STEREO_DMIC] = { | 673 | [CXT_FIXUP_STEREO_DMIC] = { |
664 | .type = HDA_FIXUP_FUNC, | 674 | .type = HDA_FIXUP_FUNC, |
665 | .v.func = cxt_fixup_stereo_dmic, | 675 | .v.func = cxt_fixup_stereo_dmic, |
@@ -769,6 +779,7 @@ static const struct hda_model_fixup cxt5047_fixup_models[] = { | |||
769 | }; | 779 | }; |
770 | 780 | ||
771 | static const struct snd_pci_quirk cxt5051_fixups[] = { | 781 | static const struct snd_pci_quirk cxt5051_fixups[] = { |
782 | SND_PCI_QUIRK(0x103c, 0x360b, "Compaq CQ60", CXT_PINCFG_COMPAQ_CQ60), | ||
772 | SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT_PINCFG_LENOVO_X200), | 783 | SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT_PINCFG_LENOVO_X200), |
773 | {} | 784 | {} |
774 | }; | 785 | }; |