Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f7278fd0a57ea6cde4988ab820851b01be20daef
Commit:     f7278fd0a57ea6cde4988ab820851b01be20daef
Parent:     64e0e2d987f5e803f001c853a433ef2fc51640cb
Author:     Josepch Chan <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 13 16:40:40 2007 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:29:33 2008 +0100

    [ALSA] hda-codec - Add  support for VIA VT1708B HD audio codec
    
    This patch adds support for VIA new HD audio codec, VT1708B.
    
    Signed-off-by: Josepch Chan <[EMAIL PROTECTED]>
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/patch_via.c |  675 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 625 insertions(+), 50 deletions(-)

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 4cdf3e6..d42d8f7 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -27,6 +27,8 @@
 /* 2006-03-14  Lydia Wang  Modify hard code for some pin widget nid          */
 /* 2006-08-02  Lydia Wang  Add support to VT1709 codec                       */
 /* 2006-09-08  Lydia Wang  Fix internal loopback recording source select bug */
+/* 2007-09-12  Lydia Wang  Add EAPD enable during driver initialization      */
+/* 2007-09-17  Lydia Wang  Add VT1708B codec support                        */
 /*                                                                           */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@@ -51,14 +53,23 @@
 #define VT1708_HP_NID          0x13
 #define VT1708_DIGOUT_NID      0x14
 #define VT1708_DIGIN_NID       0x16
+#define VT1708_DIGIN_PIN       0x26
 
 #define VT1709_HP_DAC_NID      0x28
 #define VT1709_DIGOUT_NID      0x13
 #define VT1709_DIGIN_NID       0x17
+#define VT1709_DIGIN_PIN       0x25
+
+#define VT1708B_HP_NID         0x25
+#define VT1708B_DIGOUT_NID     0x12
+#define VT1708B_DIGIN_NID      0x15
+#define VT1708B_DIGIN_PIN      0x21
 
 #define IS_VT1708_VENDORID(x)          ((x) >= 0x11061708 && (x) <= 0x1106170b)
 #define IS_VT1709_10CH_VENDORID(x)     ((x) >= 0x1106e710 && (x) <= 0x1106e713)
 #define IS_VT1709_6CH_VENDORID(x)      ((x) >= 0x1106e714 && (x) <= 0x1106e717)
+#define IS_VT1708B_8CH_VENDORID(x)     ((x) >= 0x1106e720 && (x) <= 0x1106e723)
+#define IS_VT1708B_4CH_VENDORID(x)     ((x) >= 0x1106e724 && (x) <= 0x1106e727)
 
 
 enum {
@@ -131,6 +142,11 @@ static hda_nid_t vt1709_adc_nids[3] = {
        0x14, 0x15, 0x16
 };
 
+static hda_nid_t vt1708B_adc_nids[2] = {
+       /* ADC1-2 */
+       0x13, 0x14
+};
+
 /* add dynamic controls */
 static int via_add_control(struct via_spec *spec, int type, const char *name,
                           unsigned long val)
@@ -268,9 +284,13 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
                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) )
+                 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
                return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
                                             spec->adc_nids[adc_idx],
@@ -309,15 +329,15 @@ static struct hda_verb vt1708_volume_init_verbs[] = {
        {0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
 
-       /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+       /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
         * mixer widget
         */
        /* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */
-       {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, /* master */
-       {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-       {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
-       {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
-       {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+       {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+       {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+       {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+       {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+       {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
 
        /*
         * Set up output mixers (0x19 - 0x1b)
@@ -329,10 +349,9 @@ static struct hda_verb vt1708_volume_init_verbs[] = {
        
        /* Setup default input to PW4 */
        {0x20, AC_VERB_SET_CONNECT_SEL, 0x1},
-       /* Set mic as default input of sw0 */
-       {0x18, AC_VERB_SET_CONNECT_SEL, 0x2},
        /* PW9 Output enable */
        {0x25, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+       { }
 };
 
 static int via_playback_pcm_open(struct hda_pcm_stream *hinfo,
@@ -544,6 +563,31 @@ static int via_init(struct hda_codec *codec)
 {
        struct via_spec *spec = codec->spec;
        snd_hda_sequence_write(codec, spec->init_verbs);
+       /* 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,
+                                           0x40);
+                       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,
+                                           AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                           0x40);
+                       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,
+                                           0x40);
+                       snd_hda_codec_write(codec, VT1708B_DIGIN_PIN, 0,
+                                           AC_VERB_SET_EAPD_BTLENABLE, 0x02);
+               }
+       }
+
        return 0;
 }
 
@@ -623,58 +667,68 @@ static int vt1708_auto_create_multi_out_ctls(struct 
via_spec *spec,
                if (i == AUTO_SEQ_CENLFE) {
                        /* Center/LFE */
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
-                                             "Center Playback Volume",
-                                             HDA_COMPOSE_AMP_VAL(nid_vol, 1, 
0, HDA_OUTPUT));
+                                       "Center Playback Volume",
+                                       HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,
+                                                           HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
                                              "LFE Playback Volume",
-                                             HDA_COMPOSE_AMP_VAL(nid_vol, 2, 
0, HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
                                              "Center Playback Switch",
-                                             HDA_COMPOSE_AMP_VAL(nid_vol, 1, 
0, HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
                                              "LFE Playback Switch",
-                                             HDA_COMPOSE_AMP_VAL(nid_vol, 2, 
0, HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                } else if (i == AUTO_SEQ_FRONT){
                        /* add control to mixer index 0 */
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
                                              "Master Front Playback Volume",
-                                             HDA_COMPOSE_AMP_VAL(0x17, 3, 0, 
HDA_INPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x17, 3, 0,
+                                                                 HDA_INPUT));
                        if (err < 0)
                                return err;
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
                                              "Master Front Playback Switch",
-                                             HDA_COMPOSE_AMP_VAL(0x17, 3, 0, 
HDA_INPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x17, 3, 0,
+                                                                 HDA_INPUT));
                        if (err < 0)
                                return err;
                        
                        /* add control to PW3 */
                        sprintf(name, "%s Playback Volume", chname[i]);
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
-                                             HDA_COMPOSE_AMP_VAL(nid, 3, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(nid, 3, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        sprintf(name, "%s Playback Switch", chname[i]);
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
-                                             HDA_COMPOSE_AMP_VAL(nid, 3, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(nid, 3, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                } else {
                        sprintf(name, "%s Playback Volume", chname[i]);
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
-                                             HDA_COMPOSE_AMP_VAL(nid_vol, 3, 
0, HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        sprintf(name, "%s Playback Switch", chname[i]);
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
-                                             HDA_COMPOSE_AMP_VAL(nid_vol, 3, 
0, HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                }
@@ -899,15 +953,15 @@ static struct hda_verb vt1709_10ch_volume_init_verbs[] = {
        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
 
-       /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+       /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
         * mixer widget
         */
        /* Amp Indices: AOW0=0, CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */
-       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, /* unmute master */
-       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
-       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
-       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
 
        /*
         * Set up output selector (0x1a, 0x1b, 0x29)
@@ -925,8 +979,6 @@ static struct hda_verb vt1709_10ch_volume_init_verbs[] = {
 
        /* Set input of PW4 as AOW4 */
        {0x20, AC_VERB_SET_CONNECT_SEL, 0x1},
-       /* Set mic as default input of sw0 */
-       {0x19, AC_VERB_SET_CONNECT_SEL, 0x2},
        /* PW9 Output enable */
        {0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
        { }
@@ -1073,68 +1125,80 @@ static int vt1709_auto_create_multi_out_ctls(struct 
via_spec *spec,
                        /* Center/LFE */
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
                                              "Center Playback Volume",
-                                             HDA_COMPOSE_AMP_VAL(0x1b, 1, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x1b, 1, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
                                              "LFE Playback Volume",
-                                             HDA_COMPOSE_AMP_VAL(0x1b, 2, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x1b, 2, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
                                              "Center Playback Switch",
-                                             HDA_COMPOSE_AMP_VAL(0x1b, 1, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x1b, 1, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
                                              "LFE Playback Switch",
-                                             HDA_COMPOSE_AMP_VAL(0x1b, 2, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x1b, 2, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                } else if (i == AUTO_SEQ_FRONT){
                        /* add control to mixer index 0 */
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
                                              "Master Front Playback Volume",
-                                             HDA_COMPOSE_AMP_VAL(0x18, 3, 0, 
HDA_INPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x18, 3, 0,
+                                                                 HDA_INPUT));
                        if (err < 0)
                                return err;
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
                                              "Master Front Playback Switch",
-                                             HDA_COMPOSE_AMP_VAL(0x18, 3, 0, 
HDA_INPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x18, 3, 0,
+                                                                 HDA_INPUT));
                        if (err < 0)
                                return err;
                        
                        /* add control to PW3 */
                        sprintf(name, "%s Playback Volume", chname[i]);
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
-                                             HDA_COMPOSE_AMP_VAL(nid, 3, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(nid, 3, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        sprintf(name, "%s Playback Switch", chname[i]);
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
-                                             HDA_COMPOSE_AMP_VAL(nid, 3, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(nid, 3, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                } else if (i == AUTO_SEQ_SURROUND) {
                        sprintf(name, "%s Playback Volume", chname[i]);
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
-                                             HDA_COMPOSE_AMP_VAL(0x29, 3, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x29, 3, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        sprintf(name, "%s Playback Switch", chname[i]);
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
-                                             HDA_COMPOSE_AMP_VAL(0x29, 3, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x29, 3, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                } else if (i == AUTO_SEQ_SIDE) {
                        sprintf(name, "%s Playback Volume", chname[i]);
                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
-                                             HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x1a, 3, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                        sprintf(name, "%s Playback Switch", chname[i]);
                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
-                                             HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, 
HDA_OUTPUT));
+                                             HDA_COMPOSE_AMP_VAL(0x1a, 3, 0,
+                                                                 HDA_OUTPUT));
                        if (err < 0)
                                return err;
                }
@@ -1351,8 +1415,6 @@ static struct hda_verb vt1709_6ch_volume_init_verbs[] = {
 
        /* Set input of PW4 as MW0 */
        {0x20, AC_VERB_SET_CONNECT_SEL, 0},
-       /* Set mic as default input of sw0 */
-       {0x19, AC_VERB_SET_CONNECT_SEL, 0x2},
        /* PW9 Output enable */
        {0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
        { }
@@ -1403,6 +1465,495 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
 #ifdef CONFIG_SND_HDA_POWER_SAVE
        spec->loopback.amplist = vt1709_loopbacks;
 #endif
+       return 0;
+}
+
+/* capture mixer elements */
+static struct snd_kcontrol_new vt1708B_capture_mixer[] = {
+       HDA_CODEC_VOLUME("Capture Volume", 0x13, 0x0, HDA_INPUT),
+       HDA_CODEC_MUTE("Capture Switch", 0x13, 0x0, HDA_INPUT),
+       HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x14, 0x0, HDA_INPUT),
+       HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x14, 0x0, HDA_INPUT),
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               /* The multiple "Capture Source" controls confuse alsamixer
+                * So call somewhat different..
+                * FIXME: the controls appear in the "playback" view!
+                */
+               /* .name = "Capture Source", */
+               .name = "Input Source",
+               .count = 1,
+               .info = via_mux_enum_info,
+               .get = via_mux_enum_get,
+               .put = via_mux_enum_put,
+       },
+       { } /* end */
+};
+/*
+ * generic initialization of ADC, input mixers and output mixers
+ */
+static struct hda_verb vt1708B_8ch_volume_init_verbs[] = {
+       /*
+        * Unmute ADC0-1 and set the default input to mic-in
+        */
+       {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+       {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+
+       /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+        * mixer widget
+        */
+       /* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */
+       {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+       {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+       {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+       {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+       {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+       /*
+        * Set up output mixers
+        */
+       /* set vol=0 to output mixers */
+       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+       {0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+       {0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+       /* Setup default input to PW4 */
+       {0x1d, AC_VERB_SET_CONNECT_SEL, 0x1},
+       /* PW9 Output enable */
+       {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+       /* PW10 Input enable */
+       {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+       { }
+};
+
+static struct hda_verb vt1708B_4ch_volume_init_verbs[] = {
+       /*
+        * Unmute ADC0-1 and set the default input to mic-in
+        */
+       {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+       {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+
+       /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+        * mixer widget
+        */
+       /* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */
+       {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+       {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+       {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+       {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+       {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+       /*
+        * Set up output mixers
+        */
+       /* set vol=0 to output mixers */
+       {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+       {0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+       {0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+       /* Setup default input of PW4 to MW0 */
+       {0x1d, AC_VERB_SET_CONNECT_SEL, 0x0},
+       /* PW9 Output enable */
+       {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+       /* PW10 Input enable */
+       {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+       { }
+};
+
+static struct hda_pcm_stream vt1708B_8ch_pcm_analog_playback = {
+       .substreams = 1,
+       .channels_min = 2,
+       .channels_max = 8,
+       .nid = 0x10, /* NID to query formats and rates */
+       .ops = {
+               .open = via_playback_pcm_open,
+               .prepare = via_playback_pcm_prepare,
+               .cleanup = via_playback_pcm_cleanup
+       },
+};
+
+static struct hda_pcm_stream vt1708B_4ch_pcm_analog_playback = {
+       .substreams = 1,
+       .channels_min = 2,
+       .channels_max = 4,
+       .nid = 0x10, /* NID to query formats and rates */
+       .ops = {
+               .open = via_playback_pcm_open,
+               .prepare = via_playback_pcm_prepare,
+               .cleanup = via_playback_pcm_cleanup
+       },
+};
+
+static struct hda_pcm_stream vt1708B_pcm_analog_capture = {
+       .substreams = 2,
+       .channels_min = 2,
+       .channels_max = 2,
+       .nid = 0x13, /* NID to query formats and rates */
+       .ops = {
+               .prepare = via_capture_pcm_prepare,
+               .cleanup = via_capture_pcm_cleanup
+       },
+};
+
+static struct hda_pcm_stream vt1708B_pcm_digital_playback = {
+       .substreams = 1,
+       .channels_min = 2,
+       .channels_max = 2,
+       /* NID is set in via_build_pcms */
+       .ops = {
+               .open = via_dig_playback_pcm_open,
+               .close = via_dig_playback_pcm_close,
+               .prepare = via_dig_playback_pcm_prepare
+       },
+};
+
+static struct hda_pcm_stream vt1708B_pcm_digital_capture = {
+       .substreams = 1,
+       .channels_min = 2,
+       .channels_max = 2,
+};
+
+/* fill in the dac_nids table from the parsed pin configuration */
+static int vt1708B_auto_fill_dac_nids(struct via_spec *spec,
+                                    const struct auto_pin_cfg *cfg)
+{
+       int i;
+       hda_nid_t nid;
+
+       spec->multiout.num_dacs = cfg->line_outs;
+
+       spec->multiout.dac_nids = spec->private_dac_nids;
+
+       for (i = 0; i < 4; i++) {
+               nid = cfg->line_out_pins[i];
+               if (nid) {
+                       /* config dac list */
+                       switch (i) {
+                       case AUTO_SEQ_FRONT:
+                               spec->multiout.dac_nids[i] = 0x10;
+                               break;
+                       case AUTO_SEQ_CENLFE:
+                               spec->multiout.dac_nids[i] = 0x24;
+                               break;
+                       case AUTO_SEQ_SURROUND:
+                               spec->multiout.dac_nids[i] = 0x25;
+                               break;
+                       case AUTO_SEQ_SIDE:
+                               spec->multiout.dac_nids[i] = 0x11;
+                               break;
+                       }
+               }
+       }
+
+       return 0;
+}
+
+/* add playback controls from the parsed DAC table */
+static int vt1708B_auto_create_multi_out_ctls(struct via_spec *spec,
+                                            const struct auto_pin_cfg *cfg)
+{
+       char name[32];
+       static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
+       hda_nid_t nid_vols[] = {0x16, 0x27, 0x26, 0x18};
+       hda_nid_t nid, nid_vol = 0;
+       int i, err;
+
+       for (i = 0; i <= AUTO_SEQ_SIDE; i++) {
+               nid = cfg->line_out_pins[i];
+
+               if (!nid)
+                       continue;
+
+               nid_vol = nid_vols[i];
+
+               if (i == AUTO_SEQ_CENLFE) {
+                       /* Center/LFE */
+                       err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                                             "Center Playback Volume",
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,
+                                                                 HDA_OUTPUT));
+                       if (err < 0)
+                               return err;
+                       err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                                             "LFE Playback Volume",
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,
+                                                                 HDA_OUTPUT));
+                       if (err < 0)
+                               return err;
+                       err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
+                                             "Center Playback Switch",
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,
+                                                                 HDA_OUTPUT));
+                       if (err < 0)
+                               return err;
+                       err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
+                                             "LFE Playback Switch",
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,
+                                                                 HDA_OUTPUT));
+                       if (err < 0)
+                               return err;
+               } else if (i == AUTO_SEQ_FRONT) {
+                       /* add control to mixer index 0 */
+                       err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                                             "Master Front Playback Volume",
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
+                                                                 HDA_INPUT));
+                       if (err < 0)
+                               return err;
+                       err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
+                                             "Master Front Playback Switch",
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
+                                                                 HDA_INPUT));
+                       if (err < 0)
+                               return err;
+
+                       /* add control to PW3 */
+                       sprintf(name, "%s Playback Volume", chname[i]);
+                       err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
+                                             HDA_COMPOSE_AMP_VAL(nid, 3, 0,
+                                                                 HDA_OUTPUT));
+                       if (err < 0)
+                               return err;
+                       sprintf(name, "%s Playback Switch", chname[i]);
+                       err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
+                                             HDA_COMPOSE_AMP_VAL(nid, 3, 0,
+                                                                 HDA_OUTPUT));
+                       if (err < 0)
+                               return err;
+               } else {
+                       sprintf(name, "%s Playback Volume", chname[i]);
+                       err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
+                                                                 HDA_OUTPUT));
+                       if (err < 0)
+                               return err;
+                       sprintf(name, "%s Playback Switch", chname[i]);
+                       err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
+                                             HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
+                                                                 HDA_OUTPUT));
+                       if (err < 0)
+                               return err;
+               }
+       }
+
+       return 0;
+}
+
+static int vt1708B_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
+{
+       int err;
+
+       if (!pin)
+               return 0;
+
+       spec->multiout.hp_nid = VT1708B_HP_NID; /* AOW3 */
+
+       err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                             "Headphone Playback Volume",
+                             HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
+       if (err < 0)
+               return err;
+       err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
+                             "Headphone Playback Switch",
+                             HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
+       if (err < 0)
+               return err;
+
+       return 0;
+}
+
+/* create playback/capture controls for input pins */
+static int vt1708B_auto_create_analog_input_ctls(struct via_spec *spec,
+                                               const struct auto_pin_cfg *cfg)
+{
+       static char *labels[] = {
+               "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
+       };
+       struct hda_input_mux *imux = &spec->private_imux;
+       int i, err, idx = 0;
+
+       /* for internal loopback recording select */
+       imux->items[imux->num_items].label = "Stereo Mixer";
+       imux->items[imux->num_items].index = idx;
+       imux->num_items++;
+
+       for (i = 0; i < AUTO_PIN_LAST; i++) {
+               if (!cfg->input_pins[i])
+                       continue;
+
+               switch (cfg->input_pins[i]) {
+               case 0x1a: /* Mic */
+                       idx = 2;
+                       break;
+
+               case 0x1b: /* Line In */
+                       idx = 3;
+                       break;
+
+               case 0x1e: /* Front Mic */
+                       idx = 4;
+                       break;
+
+               case 0x1f: /* CD */
+                       idx = 1;
+                       break;
+               }
+               err = via_new_analog_input(spec, cfg->input_pins[i], labels[i],
+                                          idx, 0x16);
+               if (err < 0)
+                       return err;
+               imux->items[imux->num_items].label = labels[i];
+               imux->items[imux->num_items].index = idx;
+               imux->num_items++;
+       }
+       return 0;
+}
+
+static int vt1708B_parse_auto_config(struct hda_codec *codec)
+{
+       struct via_spec *spec = codec->spec;
+       int err;
+
+       err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL);
+       if (err < 0)
+               return err;
+       err = vt1708B_auto_fill_dac_nids(spec, &spec->autocfg);
+       if (err < 0)
+               return err;
+       if (!spec->autocfg.line_outs && !spec->autocfg.hp_pins[0])
+               return 0; /* can't find valid BIOS pin config */
+
+       err = vt1708B_auto_create_multi_out_ctls(spec, &spec->autocfg);
+       if (err < 0)
+               return err;
+       err = vt1708B_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
+       if (err < 0)
+               return err;
+       err = vt1708B_auto_create_analog_input_ctls(spec, &spec->autocfg);
+       if (err < 0)
+               return err;
+
+       spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+       if (spec->autocfg.dig_out_pin)
+               spec->multiout.dig_out_nid = VT1708B_DIGOUT_NID;
+       if (spec->autocfg.dig_in_pin)
+               spec->dig_in_nid = VT1708B_DIGIN_NID;
+
+       if (spec->kctl_alloc)
+               spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+       spec->input_mux = &spec->private_imux;
+
+       return 1;
+}
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list vt1708B_loopbacks[] = {
+       { 0x16, HDA_INPUT, 1 },
+       { 0x16, HDA_INPUT, 2 },
+       { 0x16, HDA_INPUT, 3 },
+       { 0x16, HDA_INPUT, 4 },
+       { } /* end */
+};
+#endif
+
+static int patch_vt1708B_8ch(struct hda_codec *codec)
+{
+       struct via_spec *spec;
+       int err;
+
+       /* create a codec specific record */
+       spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+       if (spec == NULL)
+               return -ENOMEM;
+
+       codec->spec = spec;
+
+       /* automatic parse from the BIOS config */
+       err = vt1708B_parse_auto_config(codec);
+       if (err < 0) {
+               via_free(codec);
+               return err;
+       } else if (!err) {
+               printk(KERN_INFO "hda_codec: Cannot set up configuration "
+                      "from BIOS.  Using genenic mode...\n");
+       }
+
+       spec->init_verbs = vt1708B_8ch_volume_init_verbs;
+
+       spec->stream_name_analog = "VT1708B Analog";
+       spec->stream_analog_playback = &vt1708B_8ch_pcm_analog_playback;
+       spec->stream_analog_capture = &vt1708B_pcm_analog_capture;
+
+       spec->stream_name_digital = "VT1708B Digital";
+       spec->stream_digital_playback = &vt1708B_pcm_digital_playback;
+       spec->stream_digital_capture = &vt1708B_pcm_digital_capture;
+
+       if (!spec->adc_nids && spec->input_mux) {
+               spec->adc_nids = vt1708B_adc_nids;
+               spec->num_adc_nids = ARRAY_SIZE(vt1708B_adc_nids);
+               spec->mixers[spec->num_mixers] = vt1708B_capture_mixer;
+               spec->num_mixers++;
+       }
+
+       codec->patch_ops = via_patch_ops;
+
+       codec->patch_ops.init = via_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+       spec->loopback.amplist = vt1708B_loopbacks;
+#endif
+
+       return 0;
+}
+
+static int patch_vt1708B_4ch(struct hda_codec *codec)
+{
+       struct via_spec *spec;
+       int err;
+
+       /* create a codec specific record */
+       spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+       if (spec == NULL)
+               return -ENOMEM;
+
+       codec->spec = spec;
+
+       /* automatic parse from the BIOS config */
+       err = vt1708B_parse_auto_config(codec);
+       if (err < 0) {
+               via_free(codec);
+               return err;
+       } else if (!err) {
+               printk(KERN_INFO "hda_codec: Cannot set up configuration "
+                      "from BIOS.  Using genenic mode...\n");
+       }
+
+       spec->init_verbs = vt1708B_4ch_volume_init_verbs;
+
+       spec->stream_name_analog = "VT1708B Analog";
+       spec->stream_analog_playback = &vt1708B_4ch_pcm_analog_playback;
+       spec->stream_analog_capture = &vt1708B_pcm_analog_capture;
+
+       spec->stream_name_digital = "VT1708B Digital";
+       spec->stream_digital_playback = &vt1708B_pcm_digital_playback;
+       spec->stream_digital_capture = &vt1708B_pcm_digital_capture;
+
+       if (!spec->adc_nids && spec->input_mux) {
+               spec->adc_nids = vt1708B_adc_nids;
+               spec->num_adc_nids = ARRAY_SIZE(vt1708B_adc_nids);
+               spec->mixers[spec->num_mixers] = vt1708B_capture_mixer;
+               spec->num_mixers++;
+       }
+
+       codec->patch_ops = via_patch_ops;
+
+       codec->patch_ops.init = via_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+       spec->loopback.amplist = vt1708B_loopbacks;
+#endif
 
        return 0;
 }
@@ -1415,13 +1966,37 @@ struct hda_codec_preset snd_hda_preset_via[] = {
        { .id = 0x11061709, .name = "VIA VT1708", .patch = patch_vt1708},
        { .id = 0x1106170A, .name = "VIA VT1708", .patch = patch_vt1708},
        { .id = 0x1106170B, .name = "VIA VT1708", .patch = patch_vt1708},
-       { .id = 0x1106E710, .name = "VIA VT1709 10-Ch", .patch = 
patch_vt1709_10ch},
-       { .id = 0x1106E711, .name = "VIA VT1709 10-Ch", .patch = 
patch_vt1709_10ch},
-       { .id = 0x1106E712, .name = "VIA VT1709 10-Ch", .patch = 
patch_vt1709_10ch},
-       { .id = 0x1106E713, .name = "VIA VT1709 10-Ch", .patch = 
patch_vt1709_10ch},
-       { .id = 0x1106E714, .name = "VIA VT1709 6-Ch", .patch = 
patch_vt1709_6ch},
-       { .id = 0x1106E715, .name = "VIA VT1709 6-Ch", .patch = 
patch_vt1709_6ch},
-       { .id = 0x1106E716, .name = "VIA VT1709 6-Ch", .patch = 
patch_vt1709_6ch},
-       { .id = 0x1106E717, .name = "VIA VT1709 6-Ch", .patch = 
patch_vt1709_6ch},
+       { .id = 0x1106E710, .name = "VIA VT1709 10-Ch",
+         .patch = patch_vt1709_10ch},
+       { .id = 0x1106E711, .name = "VIA VT1709 10-Ch",
+         .patch = patch_vt1709_10ch},
+       { .id = 0x1106E712, .name = "VIA VT1709 10-Ch",
+         .patch = patch_vt1709_10ch},
+       { .id = 0x1106E713, .name = "VIA VT1709 10-Ch",
+         .patch = patch_vt1709_10ch},
+       { .id = 0x1106E714, .name = "VIA VT1709 6-Ch",
+         .patch = patch_vt1709_6ch},
+       { .id = 0x1106E715, .name = "VIA VT1709 6-Ch",
+         .patch = patch_vt1709_6ch},
+       { .id = 0x1106E716, .name = "VIA VT1709 6-Ch",
+         .patch = patch_vt1709_6ch},
+       { .id = 0x1106E717, .name = "VIA VT1709 6-Ch",
+         .patch = patch_vt1709_6ch},
+       { .id = 0x1106E720, .name = "VIA VT1708B 8-Ch",
+         .patch = patch_vt1708B_8ch},
+       { .id = 0x1106E721, .name = "VIA VT1708B 8-Ch",
+         .patch = patch_vt1708B_8ch},
+       { .id = 0x1106E722, .name = "VIA VT1708B 8-Ch",
+         .patch = patch_vt1708B_8ch},
+       { .id = 0x1106E723, .name = "VIA VT1708B 8-Ch",
+         .patch = patch_vt1708B_8ch},
+       { .id = 0x1106E724, .name = "VIA VT1708B 4-Ch",
+         .patch = patch_vt1708B_4ch},
+       { .id = 0x1106E725, .name = "VIA VT1708B 4-Ch",
+         .patch = patch_vt1708B_4ch},
+       { .id = 0x1106E726, .name = "VIA VT1708B 4-Ch",
+         .patch = patch_vt1708B_4ch},
+       { .id = 0x1106E727, .name = "VIA VT1708B 4-Ch",
+         .patch = patch_vt1708B_4ch},
        {} /* terminator */
 };
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to