| From foo@baz Thu Dec 21 09:02:40 CET 2017 |
| From: Jaroslav Kysela <perex@perex.cz> |
| Date: Thu, 9 Mar 2017 13:30:09 +0100 |
| Subject: ALSA: hda - add support for docking station for HP 840 G3 |
| |
| From: Jaroslav Kysela <perex@perex.cz> |
| |
| |
| [ Upstream commit cc3a47a248d7791ef0d2c81a35c46769e55e4c6c ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| sound/pci/hda/patch_conexant.c | 11 +++++++++++ |
| 1 file changed, 11 insertions(+) |
| |
| --- a/sound/pci/hda/patch_conexant.c |
| +++ b/sound/pci/hda/patch_conexant.c |
| @@ -261,6 +261,7 @@ enum { |
| CXT_FIXUP_HP_530, |
| CXT_FIXUP_CAP_MIX_AMP_5047, |
| CXT_FIXUP_MUTE_LED_EAPD, |
| + CXT_FIXUP_HP_DOCK, |
| CXT_FIXUP_HP_SPECTRE, |
| CXT_FIXUP_HP_GATE_MIC, |
| }; |
| @@ -778,6 +779,14 @@ static const struct hda_fixup cxt_fixups |
| .type = HDA_FIXUP_FUNC, |
| .v.func = cxt_fixup_mute_led_eapd, |
| }, |
| + [CXT_FIXUP_HP_DOCK] = { |
| + .type = HDA_FIXUP_PINS, |
| + .v.pins = (const struct hda_pintbl[]) { |
| + { 0x16, 0x21011020 }, /* line-out */ |
| + { 0x18, 0x2181103f }, /* line-in */ |
| + { } |
| + } |
| + }, |
| [CXT_FIXUP_HP_SPECTRE] = { |
| .type = HDA_FIXUP_PINS, |
| .v.pins = (const struct hda_pintbl[]) { |
| @@ -839,6 +848,7 @@ static const struct snd_pci_quirk cxt506 |
| SND_PCI_QUIRK(0x1025, 0x0543, "Acer Aspire One 522", CXT_FIXUP_STEREO_DMIC), |
| SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT_FIXUP_ASPIRE_DMIC), |
| SND_PCI_QUIRK(0x1025, 0x054f, "Acer Aspire 4830T", CXT_FIXUP_ASPIRE_DMIC), |
| + SND_PCI_QUIRK(0x103c, 0x8079, "HP EliteBook 840 G3", CXT_FIXUP_HP_DOCK), |
| SND_PCI_QUIRK(0x103c, 0x8174, "HP Spectre x360", CXT_FIXUP_HP_SPECTRE), |
| SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC), |
| SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN), |
| @@ -872,6 +882,7 @@ static const struct hda_model_fixup cxt5 |
| { .id = CXT_PINCFG_LEMOTE_A1205, .name = "lemote-a1205" }, |
| { .id = CXT_FIXUP_OLPC_XO, .name = "olpc-xo" }, |
| { .id = CXT_FIXUP_MUTE_LED_EAPD, .name = "mute-led-eapd" }, |
| + { .id = CXT_FIXUP_HP_DOCK, .name = "hp-dock" }, |
| {} |
| }; |
| |
