ALSA: hda - Add the pin fixup for HP Envy TS bass speaker

[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / patch_sigmatel.c

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 3744ea4e843dd687babcd4412fb1bcd934e11d1e..946ae4094aa3175996b45bbd6d50855debb00469 100644 (file)
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -103,6 +103,7 @@ enum {
        STAC_92HD83XXX_HP,
        STAC_HP_ENVY_BASS,
        STAC_HP_BNB13_EQ,
+       STAC_HP_ENVY_TS_BASS,
        STAC_92HD83XXX_MODELS
 };
 
@@ -1017,7 +1018,7 @@ static int stac_create_spdif_mux_ctls(struct hda_codec *codec)
        for (i = 0; i < num_cons; i++) {
                if (snd_BUG_ON(!labels[i]))
                        return -EINVAL;
-               snd_hda_add_imux_item(&spec->spdif_mux, labels[i], i, NULL);
+               snd_hda_add_imux_item(codec, &spec->spdif_mux, labels[i], i, NULL);
        }
 
        kctl = snd_hda_gen_add_kctl(&spec->gen, NULL, &stac_smux_mixer);
@@ -2668,6 +2669,13 @@ static const struct hda_fixup stac92hd83xxx_fixups[] = {
                .chained = true,
                .chain_id = STAC_92HD83XXX_HP_MIC_LED,
        },
+       [STAC_HP_ENVY_TS_BASS] = {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
+                       { 0x10, 0x92170111 },
+                       {}
+               },
+       },
 };
 
 static const struct hda_model_fixup stac92hd83xxx_models[] = {
@@ -2684,6 +2692,7 @@ static const struct hda_model_fixup stac92hd83xxx_models[] = {
        { .id = STAC_92HD83XXX_HEADSET_JACK, .name = "headset-jack" },
        { .id = STAC_HP_ENVY_BASS, .name = "hp-envy-bass" },
        { .id = STAC_HP_BNB13_EQ, .name = "hp-bnb13-eq" },
+       { .id = STAC_HP_ENVY_TS_BASS, .name = "hp-envy-ts-bass" },
        {}
 };
 
@@ -2739,6 +2748,8 @@ static const struct snd_pci_quirk stac92hd83xxx_fixup_tbl[] = {
                          "HP bNB13", STAC_HP_BNB13_EQ),
        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x190A,
                          "HP bNB13", STAC_HP_BNB13_EQ),
+       SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x190e,
+                         "HP ENVY TS", STAC_HP_ENVY_TS_BASS),
        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1940,
                          "HP bNB13", STAC_HP_BNB13_EQ),
        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1941,