2 files changed, 52 insertions, 1 deletions

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index da70bb82f637..d7660549bb91 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -870,6 +870,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           lenovo-101e   Lenovo 101E
           lenovo-nb0763 Lenovo NB0763
           lenovo-ms7195-dig Lenovo MS7195
+          haier-w66     Haier W66
           6stack-hp     HP machines with 6stack (Nettle boards)
           3stack-hp     HP machines with 3stack (Lucknow, Samba boards)
           auto          auto-config reading BIOS (default)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 4a40a056a8c6..f558b801c82d 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -177,7 +177,8 @@ enum {
         ALC883_LAPTOP_EAPD,
         ALC883_LENOVO_101E_2ch,
         ALC883_LENOVO_NB0763,
-        ALC888_LENOVO_MS7195_DIG,               
+        ALC888_LENOVO_MS7195_DIG,
+        ALC883_HAIER_W66,               
         ALC888_6ST_HP,
         ALC888_3ST_HP,
         ALC883_AUTO,
@@ -6567,6 +6568,19 @@ static struct hda_verb alc888_lenovo_ms7195_verbs[] = {
         { } /* end */
 };
 
+static struct hda_verb alc883_haier_w66_verbs[] = {
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+
+        {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        { } /* end */
+};
+
 static struct hda_verb alc888_6st_hp_verbs[] = {
         {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},  /* Front: output 0 (0x0c) */
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x02},  /* Rear : output 2 (0x0e) */
@@ -6685,6 +6699,25 @@ static void alc883_tagra_unsol_event(struct hda_codec *codec, unsigned int res)
                 alc883_tagra_automute(codec);
 }
 
+static void alc883_haier_w66_automute(struct hda_codec *codec)
+{
+        unsigned int present;
+        unsigned char bits;
+
+        present = snd_hda_codec_read(codec, 0x1b, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        bits = present ? 0x80 : 0;
+        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                 0x80, bits);
+}
+
+static void alc883_haier_w66_unsol_event(struct hda_codec *codec,
+                                         unsigned int res)
+{
+        if ((res >> 26) == ALC880_HP_EVENT)
+                alc883_haier_w66_automute(codec);
+}
+
 static void alc883_lenovo_101e_ispeaker_automute(struct hda_codec *codec)
 {
         unsigned int present;
@@ -6871,6 +6904,7 @@ static const char *alc883_models[ALC883_MODEL_LAST] = {
         [ALC883_LENOVO_101E_2ch] = "lenovo-101e",
         [ALC883_LENOVO_NB0763]  = "lenovo-nb0763",
         [ALC888_LENOVO_MS7195_DIG] = "lenovo-ms7195-dig",
+        [ALC883_HAIER_W66]      = "haier-w66",
         [ALC888_6ST_HP]         = "6stack-hp",
         [ALC888_3ST_HP]         = "3stack-hp",
         [ALC883_AUTO]           = "auto",
@@ -6915,6 +6949,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP),
         SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP),
         SND_PCI_QUIRK(0x17c0, 0x4071, "MEDION MD2", ALC883_MEDION_MD2),
+        SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),
+        SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763),
         {}
 };
 
@@ -7109,6 +7145,20 @@ static struct alc_config_preset alc883_presets[] = {
                 .input_mux = &alc883_capture_source,
                 .unsol_event = alc883_lenovo_ms7195_unsol_event,
                 .init_hook = alc888_lenovo_ms7195_front_automute,
+        },
+        [ALC883_HAIER_W66] = {
+                .mixers = { alc883_tagra_2ch_mixer},
+                .init_verbs = { alc883_init_verbs, alc883_haier_w66_verbs},
+                .num_dacs = ARRAY_SIZE(alc883_dac_nids),
+                .dac_nids = alc883_dac_nids,
+                .dig_out_nid = ALC883_DIGOUT_NID,
+                .num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
+                .adc_nids = alc883_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
+                .channel_mode = alc883_3ST_2ch_modes,
+                .input_mux = &alc883_capture_source,
+                .unsol_event = alc883_haier_w66_unsol_event,
+                .init_hook = alc883_haier_w66_automute,
         },      
         [ALC888_6ST_HP] = {
                 .mixers = { alc888_6st_hp_mixer, alc883_chmode_mixer },