diff options
author | Jaroslav Kysela <perex@perex.cz> | 2017-03-09 07:30:09 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-03-20 07:18:05 -0400 |
commit | cc3a47a248d7791ef0d2c81a35c46769e55e4c6c (patch) | |
tree | 68f53aac25c0e4b9eac830fd534082215b17678c | |
parent | 04d5466a976b096364a39a63ac264c1b3a5f8fa1 (diff) |
ALSA: hda - add support for docking station for HP 840 G3
This tested patch adds missing initialization for Line-In/Out PINs for
the docking station for HP 840 G3.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-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 c15c51bea26d..69266b8ea2ad 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
@@ -261,6 +261,7 @@ enum { | |||
261 | CXT_FIXUP_HP_530, | 261 | CXT_FIXUP_HP_530, |
262 | CXT_FIXUP_CAP_MIX_AMP_5047, | 262 | CXT_FIXUP_CAP_MIX_AMP_5047, |
263 | CXT_FIXUP_MUTE_LED_EAPD, | 263 | CXT_FIXUP_MUTE_LED_EAPD, |
264 | CXT_FIXUP_HP_DOCK, | ||
264 | CXT_FIXUP_HP_SPECTRE, | 265 | CXT_FIXUP_HP_SPECTRE, |
265 | CXT_FIXUP_HP_GATE_MIC, | 266 | CXT_FIXUP_HP_GATE_MIC, |
266 | }; | 267 | }; |
@@ -778,6 +779,14 @@ static const struct hda_fixup cxt_fixups[] = { | |||
778 | .type = HDA_FIXUP_FUNC, | 779 | .type = HDA_FIXUP_FUNC, |
779 | .v.func = cxt_fixup_mute_led_eapd, | 780 | .v.func = cxt_fixup_mute_led_eapd, |
780 | }, | 781 | }, |
782 | [CXT_FIXUP_HP_DOCK] = { | ||
783 | .type = HDA_FIXUP_PINS, | ||
784 | .v.pins = (const struct hda_pintbl[]) { | ||
785 | { 0x16, 0x21011020 }, /* line-out */ | ||
786 | { 0x18, 0x2181103f }, /* line-in */ | ||
787 | { } | ||
788 | } | ||
789 | }, | ||
781 | [CXT_FIXUP_HP_SPECTRE] = { | 790 | [CXT_FIXUP_HP_SPECTRE] = { |
782 | .type = HDA_FIXUP_PINS, | 791 | .type = HDA_FIXUP_PINS, |
783 | .v.pins = (const struct hda_pintbl[]) { | 792 | .v.pins = (const struct hda_pintbl[]) { |
@@ -839,6 +848,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { | |||
839 | SND_PCI_QUIRK(0x1025, 0x0543, "Acer Aspire One 522", CXT_FIXUP_STEREO_DMIC), | 848 | SND_PCI_QUIRK(0x1025, 0x0543, "Acer Aspire One 522", CXT_FIXUP_STEREO_DMIC), |
840 | SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT_FIXUP_ASPIRE_DMIC), | 849 | SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT_FIXUP_ASPIRE_DMIC), |
841 | SND_PCI_QUIRK(0x1025, 0x054f, "Acer Aspire 4830T", CXT_FIXUP_ASPIRE_DMIC), | 850 | SND_PCI_QUIRK(0x1025, 0x054f, "Acer Aspire 4830T", CXT_FIXUP_ASPIRE_DMIC), |
851 | SND_PCI_QUIRK(0x103c, 0x8079, "HP EliteBook 840 G3", CXT_FIXUP_HP_DOCK), | ||
842 | SND_PCI_QUIRK(0x103c, 0x8174, "HP Spectre x360", CXT_FIXUP_HP_SPECTRE), | 852 | SND_PCI_QUIRK(0x103c, 0x8174, "HP Spectre x360", CXT_FIXUP_HP_SPECTRE), |
843 | SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC), | 853 | SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC), |
844 | SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN), | 854 | SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN), |
@@ -871,6 +881,7 @@ static const struct hda_model_fixup cxt5066_fixup_models[] = { | |||
871 | { .id = CXT_PINCFG_LEMOTE_A1205, .name = "lemote-a1205" }, | 881 | { .id = CXT_PINCFG_LEMOTE_A1205, .name = "lemote-a1205" }, |
872 | { .id = CXT_FIXUP_OLPC_XO, .name = "olpc-xo" }, | 882 | { .id = CXT_FIXUP_OLPC_XO, .name = "olpc-xo" }, |
873 | { .id = CXT_FIXUP_MUTE_LED_EAPD, .name = "mute-led-eapd" }, | 883 | { .id = CXT_FIXUP_MUTE_LED_EAPD, .name = "mute-led-eapd" }, |
884 | { .id = CXT_FIXUP_HP_DOCK, .name = "hp-dock" }, | ||
874 | {} | 885 | {} |
875 | }; | 886 | }; |
876 | 887 | ||