1 files changed, 41 insertions, 14 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 01a6643fc7d4..d64dcb9a4c99 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2830,6 +2830,7 @@ static int find_ext_mic_pin(struct hda_codec *codec);
 
 static void alc286_shutup(struct hda_codec *codec)
 {
+        const struct hda_pincfg *pin;
         int i;
         int mic_pin = find_ext_mic_pin(codec);
         /* don't shut up pins when unloading the driver; otherwise it breaks
@@ -2837,8 +2838,7 @@ static void alc286_shutup(struct hda_codec *codec)
          */
         if (codec->bus->shutdown)
                 return;
-        for (i = 0; i < codec->init_pins.used; i++) {
-                struct hda_pincfg *pin = snd_array_elem(&codec->init_pins, i);
+        snd_array_for_each(&codec->init_pins, i, pin) {
                 /* use read here for syncing after issuing each verb */
                 if (pin->nid != mic_pin)
                         snd_hda_codec_read(codec, pin->nid, 0,
@@ -3653,30 +3653,37 @@ static void alc269_fixup_hp_mute_led(struct hda_codec *codec,
         }
 }
 
-static void alc269_fixup_hp_mute_led_mic1(struct hda_codec *codec,
-                                const struct hda_fixup *fix, int action)
+static void alc269_fixup_hp_mute_led_micx(struct hda_codec *codec,
+                                          const struct hda_fixup *fix,
+                                          int action, hda_nid_t pin)
 {
         struct alc_spec *spec = codec->spec;
+
         if (action == HDA_FIXUP_ACT_PRE_PROBE) {
                 spec->mute_led_polarity = 0;
-                spec->mute_led_nid = 0x18;
+                spec->mute_led_nid = pin;
                 spec->gen.vmaster_mute.hook = alc269_fixup_mic_mute_hook;
                 spec->gen.vmaster_mute_enum = 1;
                 codec->power_filter = led_power_filter;
         }
 }
 
+static void alc269_fixup_hp_mute_led_mic1(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        alc269_fixup_hp_mute_led_micx(codec, fix, action, 0x18);
+}
+
 static void alc269_fixup_hp_mute_led_mic2(struct hda_codec *codec,
                                 const struct hda_fixup *fix, int action)
 {
-        struct alc_spec *spec = codec->spec;
-        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
-                spec->mute_led_polarity = 0;
-                spec->mute_led_nid = 0x19;
-                spec->gen.vmaster_mute.hook = alc269_fixup_mic_mute_hook;
-                spec->gen.vmaster_mute_enum = 1;
-                codec->power_filter = led_power_filter;
-        }
+        alc269_fixup_hp_mute_led_micx(codec, fix, action, 0x19);
+}
+
+static void alc269_fixup_hp_mute_led_mic3(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        alc269_fixup_hp_mute_led_micx(codec, fix, action, 0x1b);
 }
 
 /* update LED status via GPIO */
@@ -5387,6 +5394,9 @@ static void alc274_fixup_bind_dacs(struct hda_codec *codec,
 /* for dell wmi mic mute led */
 #include "dell_wmi_helper.c"
 
+/* for alc295_fixup_hp_top_speakers */
+#include "hp_x360_helper.c"
+
 enum {
         ALC269_FIXUP_SONY_VAIO,
         ALC275_FIXUP_SONY_VAIO_GPIO2,
@@ -5413,6 +5423,7 @@ enum {
         ALC269_FIXUP_HP_MUTE_LED,
         ALC269_FIXUP_HP_MUTE_LED_MIC1,
         ALC269_FIXUP_HP_MUTE_LED_MIC2,
+        ALC269_FIXUP_HP_MUTE_LED_MIC3,
         ALC269_FIXUP_HP_GPIO_LED,
         ALC269_FIXUP_HP_GPIO_MIC1_LED,
         ALC269_FIXUP_HP_LINE1_MIC1_LED,
@@ -5506,6 +5517,7 @@ enum {
         ALC298_FIXUP_TPT470_DOCK,
         ALC255_FIXUP_DUMMY_LINEOUT_VERB,
         ALC255_FIXUP_DELL_HEADSET_MIC,
+        ALC295_FIXUP_HP_X360,
 };
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -5672,6 +5684,10 @@ static const struct hda_fixup alc269_fixups[] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc269_fixup_hp_mute_led_mic2,
         },
+        [ALC269_FIXUP_HP_MUTE_LED_MIC3] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc269_fixup_hp_mute_led_mic3,
+        },
         [ALC269_FIXUP_HP_GPIO_LED] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc269_fixup_hp_gpio_led,
@@ -6375,6 +6391,12 @@ static const struct hda_fixup alc269_fixups[] = {
                 .chained = true,
                 .chain_id = ALC269_FIXUP_HEADSET_MIC
         },
+        [ALC295_FIXUP_HP_X360] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc295_fixup_hp_top_speakers,
+                .chained = true,
+                .chain_id = ALC269_FIXUP_HP_MUTE_LED_MIC3
+        }
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -6494,6 +6516,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
         SND_PCI_QUIRK(0x103c, 0x221c, "HP EliteBook 755 G2", ALC280_FIXUP_HP_HEADSET_MIC),
         SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),
+        SND_PCI_QUIRK(0x103c, 0x827e, "HP x360", ALC295_FIXUP_HP_X360),
         SND_PCI_QUIRK(0x103c, 0x82bf, "HP", ALC221_FIXUP_HP_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x82c0, "HP", ALC221_FIXUP_HP_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
@@ -6580,7 +6603,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x312f, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
         SND_PCI_QUIRK(0x17aa, 0x3138, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
         SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
-        SND_PCI_QUIRK(0x17aa, 0x3112, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
         SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
         SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
         SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP),
@@ -6752,6 +6774,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                 {0x1b, 0x01111010},
                 {0x1e, 0x01451130},
                 {0x21, 0x02211020}),
+        SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,
+                {0x12, 0x90a60140},
+                {0x14, 0x90170110},
+                {0x19, 0x02a11030},
+                {0x21, 0x02211020}),
         SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
                 {0x12, 0x90a60140},
                 {0x14, 0x90170110},