1 files changed, 51 insertions, 38 deletions

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 8e004fb6961a..9008b4b013aa 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -210,7 +210,9 @@ struct via_spec {
         /* capture */
         unsigned int num_adc_nids;
         hda_nid_t *adc_nids;
+        hda_nid_t mux_nids[3];
         hda_nid_t dig_in_nid;
+        hda_nid_t dig_in_pin;
 
         /* capture source */
         const struct hda_input_mux *input_mux;
@@ -319,6 +321,9 @@ static void via_auto_set_output_and_unmute(struct hda_codec *codec,
                             pin_type);
         snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
                             AMP_OUT_UNMUTE);
+        if (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_EAPD)
+                snd_hda_codec_write(codec, nid, 0, 
+                                    AC_VERB_SET_EAPD_BTLENABLE, 0x02);
 }
 
 
@@ -387,27 +392,12 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct via_spec *spec = codec->spec;
         unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-        unsigned int vendor_id = codec->vendor_id;
-
-        /* AIW0  lydia 060801 add for correct sw0 input select */
-        if (IS_VT1708_VENDORID(vendor_id) && (adc_idx == 0))
-                return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
-                                             0x18, &spec->cur_mux[adc_idx]);
-        else if ((IS_VT1709_10CH_VENDORID(vendor_id) ||
-                  IS_VT1709_6CH_VENDORID(vendor_id)) && (adc_idx == 0))
-                return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
-                                             0x19, &spec->cur_mux[adc_idx]);
-        else if ((IS_VT1708B_8CH_VENDORID(vendor_id) ||
-                  IS_VT1708B_4CH_VENDORID(vendor_id)) && (adc_idx == 0))
-                return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
-                                             0x17, &spec->cur_mux[adc_idx]);
-        else if (IS_VT1702_VENDORID(vendor_id) && (adc_idx == 0))
-                return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
-                                             0x13, &spec->cur_mux[adc_idx]);
-        else
-                return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
-                                             spec->adc_nids[adc_idx],
-                                             &spec->cur_mux[adc_idx]);
+
+        if (!spec->mux_nids[adc_idx])
+                return -EINVAL;
+        return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
+                                     spec->mux_nids[adc_idx],
+                                     &spec->cur_mux[adc_idx]);
 }
 
 static int via_independent_hp_info(struct snd_kcontrol *kcontrol,
@@ -998,25 +988,11 @@ static int via_init(struct hda_codec *codec)
 
         /* Lydia Add for EAPD enable */
         if (!spec->dig_in_nid) { /* No Digital In connection */
-                if (IS_VT1708_VENDORID(codec->vendor_id)) {
-                        snd_hda_codec_write(codec, VT1708_DIGIN_PIN, 0,
-                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            PIN_OUT);
-                        snd_hda_codec_write(codec, VT1708_DIGIN_PIN, 0,
-                                            AC_VERB_SET_EAPD_BTLENABLE, 0x02);
-                } else if (IS_VT1709_10CH_VENDORID(codec->vendor_id) ||
-                           IS_VT1709_6CH_VENDORID(codec->vendor_id)) {
-                        snd_hda_codec_write(codec, VT1709_DIGIN_PIN, 0,
+                if (spec->dig_in_pin) {
+                        snd_hda_codec_write(codec, spec->dig_in_pin, 0,
                                             AC_VERB_SET_PIN_WIDGET_CONTROL,
                                             PIN_OUT);
-                        snd_hda_codec_write(codec, VT1709_DIGIN_PIN, 0,
-                                            AC_VERB_SET_EAPD_BTLENABLE, 0x02);
-                } else if (IS_VT1708B_8CH_VENDORID(codec->vendor_id) ||
-                           IS_VT1708B_4CH_VENDORID(codec->vendor_id)) {
-                        snd_hda_codec_write(codec, VT1708B_DIGIN_PIN, 0,
-                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            PIN_OUT);
-                        snd_hda_codec_write(codec, VT1708B_DIGIN_PIN, 0,
+                        snd_hda_codec_write(codec, spec->dig_in_pin, 0,
                                             AC_VERB_SET_EAPD_BTLENABLE, 0x02);
                 }
         } else /* enable SPDIF-input pin */
@@ -1326,6 +1302,7 @@ static int vt1708_parse_auto_config(struct hda_codec *codec)
 
         if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = VT1708_DIGOUT_NID;
+        spec->dig_in_pin = VT1708_DIGIN_PIN;
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = VT1708_DIGIN_NID;
 
@@ -1352,6 +1329,34 @@ static int via_auto_init(struct hda_codec *codec)
         return 0;
 }
 
+static int get_mux_nids(struct hda_codec *codec)
+{
+        struct via_spec *spec = codec->spec;
+        hda_nid_t nid, conn[8];
+        unsigned int type;
+        int i, n;
+
+        for (i = 0; i < spec->num_adc_nids; i++) {
+                nid = spec->adc_nids[i];
+                while (nid) {
+                        type = (get_wcaps(codec, nid) & AC_WCAP_TYPE)
+                                >> AC_WCAP_TYPE_SHIFT;
+                        if (type == AC_WID_PIN)
+                                break;
+                        n = snd_hda_get_connections(codec, nid, conn,
+                                                    ARRAY_SIZE(conn));
+                        if (n <= 0)
+                                break;
+                        if (n > 1) {
+                                spec->mux_nids[i] = nid;
+                                break;
+                        }
+                        nid = conn[0];
+                }
+        }
+        return 0;
+}
+
 static int patch_vt1708(struct hda_codec *codec)
 {
         struct via_spec *spec;
@@ -1799,6 +1804,7 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)
 
         if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = VT1709_DIGOUT_NID;
+        spec->dig_in_pin = VT1709_DIGIN_PIN;
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = VT1709_DIGIN_NID;
 
@@ -1859,6 +1865,7 @@ static int patch_vt1709_10ch(struct hda_codec *codec)
         if (!spec->adc_nids && spec->input_mux) {
                 spec->adc_nids = vt1709_adc_nids;
                 spec->num_adc_nids = ARRAY_SIZE(vt1709_adc_nids);
+                get_mux_nids(codec);
                 spec->mixers[spec->num_mixers] = vt1709_capture_mixer;
                 spec->num_mixers++;
         }
@@ -1952,6 +1959,7 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
         if (!spec->adc_nids && spec->input_mux) {
                 spec->adc_nids = vt1709_adc_nids;
                 spec->num_adc_nids = ARRAY_SIZE(vt1709_adc_nids);
+                get_mux_nids(codec);
                 spec->mixers[spec->num_mixers] = vt1709_capture_mixer;
                 spec->num_mixers++;
         }
@@ -2344,6 +2352,7 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec)
 
         if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = VT1708B_DIGOUT_NID;
+        spec->dig_in_pin = VT1708B_DIGIN_PIN;
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = VT1708B_DIGIN_NID;
 
@@ -2404,6 +2413,7 @@ static int patch_vt1708B_8ch(struct hda_codec *codec)
         if (!spec->adc_nids && spec->input_mux) {
                 spec->adc_nids = vt1708B_adc_nids;
                 spec->num_adc_nids = ARRAY_SIZE(vt1708B_adc_nids);
+                get_mux_nids(codec);
                 spec->mixers[spec->num_mixers] = vt1708B_capture_mixer;
                 spec->num_mixers++;
         }
@@ -2455,6 +2465,7 @@ static int patch_vt1708B_4ch(struct hda_codec *codec)
         if (!spec->adc_nids && spec->input_mux) {
                 spec->adc_nids = vt1708B_adc_nids;
                 spec->num_adc_nids = ARRAY_SIZE(vt1708B_adc_nids);
+                get_mux_nids(codec);
                 spec->mixers[spec->num_mixers] = vt1708B_capture_mixer;
                 spec->num_mixers++;
         }
@@ -2889,6 +2900,7 @@ static int patch_vt1708S(struct hda_codec *codec)
         if (!spec->adc_nids && spec->input_mux) {
                 spec->adc_nids = vt1708S_adc_nids;
                 spec->num_adc_nids = ARRAY_SIZE(vt1708S_adc_nids);
+                get_mux_nids(codec);
                 spec->mixers[spec->num_mixers] = vt1708S_capture_mixer;
                 spec->num_mixers++;
         }
@@ -3206,6 +3218,7 @@ static int patch_vt1702(struct hda_codec *codec)
         if (!spec->adc_nids && spec->input_mux) {
                 spec->adc_nids = vt1702_adc_nids;
                 spec->num_adc_nids = ARRAY_SIZE(vt1702_adc_nids);
+                get_mux_nids(codec);
                 spec->mixers[spec->num_mixers] = vt1702_capture_mixer;
                 spec->num_mixers++;
         }