Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (28 commits)
  [ALSA] Kconfig SND_SEQUENCER_OSS help text fix
  [ALSA] Add Aux input switch control for Aureon Universe
  [ALSA] pcxhr - Fix the crash with REV01 board
  [ALSA] sound/pci/hda: use create_singlethread_workqueue()
  [ALSA] hda-intel - Add support of ATI SB600
  [ALSA] cs4281 - Fix the check of timeout in probe
  [ALSA] cs4281 - Fix the check of right channel
  [ALSA] Test volume resolution of usb audio at initialization
  [ALSA] maestro3.c: fix BUG, optimization
  [ALSA] HDA/Realtek: multiple input mux definitions and pin mode additions
  [ALSA] AdLib FM card driver
  [ALSA] Fix / clean up PCM-OSS setup hooks
  [ALSA] Clean up PCM codes (take 2)
  [ALSA] Tiny clean up of PCM codes
  [ALSA] ISA drivers bailing on first !enable[i]
  [ALSA] Remove obsolete kfree_nocheck call
  [ALSA] Remove obsolete kfree_nocheck call
  [ALSA] Add snd-als300 driver for Avance Logic ALS300/ALS300+ soundcards
  [ALSA] Add snd-riptide driver for Conexant Riptide chip
  [ALSA] hda-codec - Fix noisy output wtih AD1986A 3stack model
  ...

1 files changed, 35 insertions, 18 deletions

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index b56ca4019392..abe9493f0a2c 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -534,6 +534,22 @@ static int stac92xx_build_pcms(struct hda_codec *codec)
         return 0;
 }
 
+static unsigned int stac92xx_get_vref(struct hda_codec *codec, hda_nid_t nid)
+{
+        unsigned int pincap = snd_hda_param_read(codec, nid,
+                                                 AC_PAR_PIN_CAP);
+        pincap = (pincap & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT;
+        if (pincap & AC_PINCAP_VREF_100)
+                return AC_PINCTL_VREF_100;
+        if (pincap & AC_PINCAP_VREF_80)
+                return AC_PINCTL_VREF_80;
+        if (pincap & AC_PINCAP_VREF_50)
+                return AC_PINCTL_VREF_50;
+        if (pincap & AC_PINCAP_VREF_GRD)
+                return AC_PINCTL_VREF_GRD;
+        return 0;
+}
+
 static void stac92xx_auto_set_pinctl(struct hda_codec *codec, hda_nid_t nid, int pin_type)
 
 {
@@ -571,9 +587,12 @@ static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
 
         if (val)
                 stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
-        else
-                stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_IN_EN);
-
+        else {
+                unsigned int pinctl = AC_PINCTL_IN_EN;
+                if (io_idx) /* set VREF for mic */
+                        pinctl |= stac92xx_get_vref(codec, nid);
+                stac92xx_auto_set_pinctl(codec, nid, pinctl);
+        }
         return 1;
 }
 
@@ -767,13 +786,8 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec, struct auto_pin
                 return 0;
 
         wid_caps = get_wcaps(codec, pin);
-        if (wid_caps & AC_WCAP_UNSOL_CAP) {
-                /* Enable unsolicited responses on the HP widget */
-                snd_hda_codec_write(codec, pin, 0,
-                                AC_VERB_SET_UNSOLICITED_ENABLE,
-                                STAC_UNSOL_ENABLE);
+        if (wid_caps & AC_WCAP_UNSOL_CAP)
                 spec->hp_detect = 1;
-        }
 
         nid = snd_hda_codec_read(codec, pin, 0, AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
         for (i = 0; i < cfg->line_outs; i++) {
@@ -896,13 +910,8 @@ static int stac9200_auto_create_hp_ctls(struct hda_codec *codec,
                 return 0;
 
         wid_caps = get_wcaps(codec, pin);
-        if (wid_caps & AC_WCAP_UNSOL_CAP) {
-                /* Enable unsolicited responses on the HP widget */
-                snd_hda_codec_write(codec, pin, 0,
-                                AC_VERB_SET_UNSOLICITED_ENABLE,
-                                STAC_UNSOL_ENABLE);
+        if (wid_caps & AC_WCAP_UNSOL_CAP)
                 spec->hp_detect = 1;
-        }
 
         return 0;
 }
@@ -944,6 +953,10 @@ static int stac92xx_init(struct hda_codec *codec)
 
         /* set up pins */
         if (spec->hp_detect) {
+                /* Enable unsolicited responses on the HP widget */
+                snd_hda_codec_write(codec, cfg->hp_pin, 0,
+                                AC_VERB_SET_UNSOLICITED_ENABLE,
+                                STAC_UNSOL_ENABLE);
                 /* fake event to set up pins */
                 codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
         } else {
@@ -951,9 +964,13 @@ static int stac92xx_init(struct hda_codec *codec)
                 stac92xx_auto_init_hp_out(codec);
         }
         for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (cfg->input_pins[i])
-                        stac92xx_auto_set_pinctl(codec, cfg->input_pins[i],
-                                                 AC_PINCTL_IN_EN);
+                hda_nid_t nid = cfg->input_pins[i];
+                if (nid) {
+                        unsigned int pinctl = AC_PINCTL_IN_EN;
+                        if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC)
+                                pinctl |= stac92xx_get_vref(codec, nid);
+                        stac92xx_auto_set_pinctl(codec, nid, pinctl);
+                }
         }
         if (cfg->dig_out_pin)
                 stac92xx_auto_set_pinctl(codec, cfg->dig_out_pin,