Changeset 69

Timestamp:

Jan 14, 2006, 6:36:36 PM (20 years ago)

Author:

vladest

Message:

HDA host and appropriate codecs support update. Not testsd!!!

Location:

GPL/trunk/alsa-kernel/pci/hda

Files:

• hda_codec.c (modified) (72 diffs)
• hda_codec.h (modified) (16 diffs)
• hda_generic.c (modified) (31 diffs)
• hda_intel.c (modified) (77 diffs)
• hda_local.h (modified) (7 diffs)
• hda_patch.h (modified) (1 diff)
• hda_proc.c (modified) (13 diffs)
• makefile.os2 (modified) (1 diff)
• patch_analog.c (modified) (23 diffs)
• patch_cmedia.c (modified) (34 diffs)
• patch_realtek.c (modified) (18 diffs)
• patch_si3054.c (added)
• patch_sigmatel.c (modified) (21 diffs)

GPL/trunk/alsa-kernel/pci/hda/hda_codec.c

@@ -49 +49 @@
 /* codec vendor labels */
 static struct hda_vendor_id hda_vendor_ids[] = {
-    { 0x10ec, "Realtek" },
-    { 0x11d4, "Analog Devices" },
-    { 0x13f6, "C-Media" },
-    { 0x434d, "C-Media" },
-    { 0x8384, "SigmaTel" },
-    {0} /* terminator */
+        { 0x10ec, "Realtek" },
+        { 0x11d4, "Analog Devices" },
+        { 0x13f6, "C-Media" },
+        { 0x434d, "C-Media" },
+        { 0x8384, "SigmaTel" },
+        {0} /* terminator */
 };
 
@@ -156 +156 @@
 {
         unsigned int parm;
-        int i, j, conn_len, num_tupples, conns;
+        int i, conn_len, conns;
         unsigned int shift, num_elems, mask;
+        hda_nid_t prev_nid;
 
         snd_assert(conn_list && max_conns > 0, return -EINVAL);
@@ -172 +173 @@
         }
         conn_len = parm & AC_CLIST_LENGTH;
-        num_tupples = num_elems / 2;
         mask = (1 << (shift-1)) - 1;
 
@@ -187 +187 @@
         /* multi connection */
         conns = 0;
-        for (i = 0; i < conn_len; i += num_elems) {
-                parm = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_LIST, i);
-                for (j = 0; j < num_tupples; j++) {
-                        int range_val;
-                        hda_nid_t val1, val2, n;
-                        range_val = parm & (1 << (shift-1)); /* ranges */
-                        val1 = parm & mask;
-                        parm >>= shift;
-                        val2 = parm & mask;
-                        parm >>= shift;
-                        if (range_val) {
-                                /* ranges between val1 and val2 */
-                                if (val1 > val2) {
-                                        snd_printk(KERN_WARNING "hda_codec: invalid dep_range_val %x:%x\n", val1, val2);
-                                        continue;
+        prev_nid = 0;
+        for (i = 0; i < conn_len; i++) {
+                int range_val;
+                hda_nid_t val, n;
+
+                if (i % num_elems == 0)
+                        parm = snd_hda_codec_read(codec, nid, 0,
+                                                  AC_VERB_GET_CONNECT_LIST, i);
+                range_val = !! (parm & (1 << (shift-1))); /* ranges */
+                val = parm & mask;
+                parm >>= shift;
+                if (range_val) {
+                        /* ranges between the previous and this one */
+                        if (! prev_nid || prev_nid >= val) {
+                                snd_printk(KERN_WARNING "hda_codec: invalid dep_range_val %x:%x\n", prev_nid, val);
+                                continue;
+                        }
+                        for (n = prev_nid + 1; n <= val; n++) {
+                                if (conns >= max_conns) {
+                                        snd_printk(KERN_ERR "Too many connections\n");
+                                        return -EINVAL;
                                 }
-                                for (n = val1; n <= val2; n++) {
-                                        if (conns >= max_conns)
-                                                return -EINVAL;
-                                        conn_list[conns++] = n;
-                                }
-                        } else {
-                                if (! val1)
-                                        break;
-                                if (conns >= max_conns)
-                                        return -EINVAL;
-                                conn_list[conns++] = val1;
-                                if (! val2)
-                                        break;
-                                if (conns >= max_conns)
-                                        return -EINVAL;
-                                conn_list[conns++] = val2;
+                                conn_list[conns++] = n;
                         }
+                } else {
+                        if (conns >= max_conns) {
+                                snd_printk(KERN_ERR "Too many connections\n");
+                                return -EINVAL;
+                        }
+                        conn_list[conns++] = val;
                 }
+                prev_nid = val;
         }
         return conns;
@@ -240 +238 @@
 int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex)
 {
-#if 0
         struct hda_bus_unsolicited *unsol;
         unsigned int wp;
@@ -255 +252 @@
 
         queue_work(unsol->workq, &unsol->work);
-#endif
+
         return 0;
 }
@@ -288 +285 @@
 static int init_unsol_queue(struct hda_bus *bus)
 {
-#if 0
         struct hda_bus_unsolicited *unsol;
 
-        unsol = kcalloc(1, sizeof(*unsol), GFP_KERNEL);
+        if (bus->unsol) /* already initialized */
+                return 0;
+
+        unsol = kzalloc(sizeof(*unsol), GFP_KERNEL);
         if (! unsol) {
                 snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n");
@@ -303 +302 @@
         }
         INIT_WORK(&unsol->work, process_unsol_events, bus);
-        bus->unsol = unsol;
-#endif
+        bus->unsol = unsol;
         return 0;
 }
@@ -319 +317 @@
         if (! bus)
                 return 0;
-        if (bus->unsol) {
-#if 0
-            destroy_workqueue(bus->unsol->workq);
-#endif
+        if (bus->unsol) {
+                destroy_workqueue(bus->unsol->workq);
                 kfree(bus->unsol);
         }
@@ -335 +331 @@
 }
 
-static int snd_hda_bus_dev_free(snd_device_t *device)
+static int snd_hda_bus_dev_free(struct snd_device *device)
 {
         struct hda_bus *bus = device->device_data;
@@ -349 +345 @@
  * Returns 0 if successful, or a negative error code.
  */
-int snd_hda_bus_new(snd_card_t *card, const struct hda_bus_template *temp,
+int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,
                     struct hda_bus **busp)
 {
         struct hda_bus *bus;
         int err;
-        static snd_device_ops_t dev_ops = {
-                /*.dev_free = */snd_hda_bus_dev_free,0,0,0
+        static struct snd_device_ops dev_ops = {
+                .dev_free = snd_hda_bus_dev_free,
         };
 
@@ -364 +360 @@
                 *busp = NULL;
 
-        bus = kcalloc(1, sizeof(*bus), GFP_KERNEL);
+        bus = kzalloc(sizeof(*bus), GFP_KERNEL);
         if (bus == NULL) {
                 snd_printk(KERN_ERR "can't allocate struct hda_bus\n");
@@ -378 +374 @@
         init_MUTEX(&bus->cmd_mutex);
         INIT_LIST_HEAD(&bus->codec_list);
-
-        init_unsol_queue(bus);
 
         if ((err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops)) < 0) {
@@ -438 +432 @@
 
 /*
- * look for an AFG node
- *
- * return 0 if not found
- */
-static int look_for_afg_node(struct hda_codec *codec)
+ * look for an AFG and MFG nodes
+ */
+static void setup_fg_nodes(struct hda_codec *codec)
 {
         int i, total_nodes;
@@ -448 +440 @@
 
         total_nodes = snd_hda_get_sub_nodes(codec, AC_NODE_ROOT, &nid);
-        for (i = 0; i < total_nodes; i++, nid++) {
-            if ((snd_hda_param_read(codec, nid, AC_PAR_FUNCTION_TYPE) & 0xff) ==
-                AC_GRP_AUDIO_FUNCTION)
-                return nid;
-        }
-        return 0;
-}
+        for (i = 0; i < total_nodes; i++, nid++) {
+                switch((snd_hda_param_read(codec, nid, AC_PAR_FUNCTION_TYPE) & 0xff)) {
+                case AC_GRP_AUDIO_FUNCTION:
+                        codec->afg = nid;
+                        break;
+                case AC_GRP_MODEM_FUNCTION:
+                        codec->mfg = nid;
+                        break;
+                default:
+                        break;
+                }
+        }
+}
+
+/*
+ * read widget caps for each widget and store in cache
+ */
+static int read_widget_caps(struct hda_codec *codec, hda_nid_t fg_node)
+{
+        int i;
+        hda_nid_t nid;
+
+        codec->num_nodes = snd_hda_get_sub_nodes(codec, fg_node,
+                                                 &codec->start_nid);
+        codec->wcaps = kmalloc(codec->num_nodes * 4, GFP_KERNEL);
+        if (! codec->wcaps)
+                return -ENOMEM;
+        nid = codec->start_nid;
+        for (i = 0; i < codec->num_nodes; i++, nid++)
+                codec->wcaps[i] = snd_hda_param_read(codec, nid,
+                                                     AC_PAR_AUDIO_WIDGET_CAP);
+        return 0;
+}
+
 
 /*
@@ -467 +486 @@
         if (codec->patch_ops.free)
                 codec->patch_ops.free(codec);
+        kfree(codec->amp_info);
+        kfree(codec->wcaps);
         kfree(codec);
 }
@@ -495 +516 @@
         }
 
-        codec = kcalloc(1, sizeof(*codec), GFP_KERNEL);
+        codec = kzalloc(sizeof(*codec), GFP_KERNEL);
         if (codec == NULL) {
                 snd_printk(KERN_ERR "can't allocate struct hda_codec\n");
@@ -513 +534 @@
         codec->revision_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_REV_ID);
 
-        /* FIXME: support for multiple AFGs? */
-        codec->afg = look_for_afg_node(codec);
-        if (! codec->afg) {
-                snd_printk(KERN_ERR "hda_codec: no AFG node found\n");
+        setup_fg_nodes(codec);
+        if (! codec->afg && ! codec->mfg) {
+                snd_printdd("hda_codec: no AFG or MFG node found\n");
                 snd_hda_codec_free(codec);
                 return -ENODEV;
+        }
+
+        if (read_widget_caps(codec, codec->afg ? codec->afg : codec->mfg) < 0) {
+                snd_printk(KERN_ERR "hda_codec: cannot malloc\n");
+                snd_hda_codec_free(codec);
+                return -ENOMEM;
+        }
+
+        if (! codec->subsystem_id) {
+                hda_nid_t nid = codec->afg ? codec->afg : codec->mfg;
+                codec->subsystem_id = snd_hda_codec_read(codec, nid, 0,
+                                                         AC_VERB_GET_SUBSYSTEM_ID,
+                                                         0);
         }
 
@@ -535 +568 @@
         }
 
+        if (codec->patch_ops.unsol_event)
+                init_unsol_queue(bus);
+
         snd_hda_codec_proc_new(codec);
 
@@ -554 +590 @@
  */
 void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, u32 stream_tag,
-                                int channel_id, int format)
-{
-    if (! nid)
-        return;
-    snd_printdd("hda_codec_setup_stream: NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n",
-                nid, stream_tag, channel_id, format);
-    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID,
-                        (stream_tag << 4) | channel_id);
-    msleep(1);
-    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, format);
+                                int channel_id, int format)
+{
+        if (! nid)
+                return;
+
+        snd_printdd("hda_codec_setup_stream: NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n",
+                    nid, stream_tag, channel_id, format);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID,
+                            (stream_tag << 4) | channel_id);
+        msleep(1);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, format);
 }
 
@@ -574 +611 @@
 #define HDA_HASH_KEY(nid,dir,idx) (u32)((nid) + ((idx) << 16) + ((dir) << 24))
 #define INFO_AMP_CAPS   (1<<0)
-#define INFO_AMP_VOL(ch)        (1 << (1 + (ch)))
+#define INFO_AMP_VOL(ch)        (1 << (1 + (ch)))
 
 /* initialize the hash table */
@@ -581 +618 @@
         memset(codec->amp_hash, 0xff, sizeof(codec->amp_hash));
         codec->num_amp_entries = 0;
+        codec->amp_info_size = 0;
+        codec->amp_info = NULL;
 }
 
@@ -598 +637 @@
 
         /* add a new hash entry */
-        if (codec->num_amp_entries >= ARRAY_SIZE(codec->amp_info)) {
-                snd_printk(KERN_ERR "hda_codec: Tooooo many amps!\n");
-                return NULL;
+        if (codec->num_amp_entries >= codec->amp_info_size) {
+                /* reallocate the array */
+                int new_size = codec->amp_info_size + 64;
+                struct hda_amp_info *new_info = kcalloc(new_size, sizeof(struct hda_amp_info),
+                                                        GFP_KERNEL);
+                if (! new_info) {
+                        snd_printk(KERN_ERR "hda_codec: can't malloc amp_info\n");
+                        return NULL;
+                }
+                if (codec->amp_info) {
+                        memcpy(new_info, codec->amp_info,
+                               codec->amp_info_size * sizeof(struct hda_amp_info));
+                        kfree(codec->amp_info);
+                }
+                codec->amp_info_size = new_size;
+                codec->amp_info = new_info;
         }
         cur = codec->num_amp_entries++;
@@ -621 +673 @@
         if (! info)
                 return 0;
-        if (! (info->status & INFO_AMP_CAPS)) {
-            if (!(snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP) & AC_WCAP_AMP_OVRD))
-                nid = codec->afg;
-            info->amp_caps = snd_hda_param_read(codec, nid, direction == HDA_OUTPUT ?
-                                                AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP);
-            info->status |= INFO_AMP_CAPS;
+        if (! (info->status & INFO_AMP_CAPS)) {
+                if (! (get_wcaps(codec, nid) & AC_WCAP_AMP_OVRD))
+                        nid = codec->afg;
+                info->amp_caps = snd_hda_param_read(codec, nid, direction == HDA_OUTPUT ?
+                                                    AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP);
+                info->status |= INFO_AMP_CAPS;
         }
         return info->amp_caps;
@@ -636 +688 @@
  */
 static unsigned int get_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,
-                                 hda_nid_t nid, int ch, int direction, int index)
-{
-    u32 val, parm;
-
-    if (info->status & INFO_AMP_VOL(ch))
-        return info->vol[ch];
-
-    parm = ch ? AC_AMP_GET_RIGHT : AC_AMP_GET_LEFT;
-    parm |= direction == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT;
-    parm |= index;
-    val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE, parm);
-    info->vol[ch] = val & 0xff;
-    info->status |= INFO_AMP_VOL(ch);
-    return info->vol[ch];
+                         hda_nid_t nid, int ch, int direction, int index)
+{
+        u32 val, parm;
+
+        if (info->status & INFO_AMP_VOL(ch))
+                return info->vol[ch];
+
+        parm = ch ? AC_AMP_GET_RIGHT : AC_AMP_GET_LEFT;
+        parm |= direction == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT;
+        parm |= index;
+        val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE, parm);
+        info->vol[ch] = val & 0xff;
+        info->status |= INFO_AMP_VOL(ch);
+        return info->vol[ch];
 }
 
@@ -656 +708 @@
  */
 static void put_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,
-                         hda_nid_t nid, int ch, int direction, int index, int val)
-{
-    u32 parm;
-
-    parm = ch ? AC_AMP_SET_RIGHT : AC_AMP_SET_LEFT;
-    parm |= direction == HDA_OUTPUT ? AC_AMP_SET_OUTPUT : AC_AMP_SET_INPUT;
-    parm |= index << AC_AMP_SET_INDEX_SHIFT;
-    parm |= val;
-    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, parm);
-    info->vol[ch] = val;
+                         hda_nid_t nid, int ch, int direction, int index, int val)
+{
+        u32 parm;
+
+        parm = ch ? AC_AMP_SET_RIGHT : AC_AMP_SET_LEFT;
+        parm |= direction == HDA_OUTPUT ? AC_AMP_SET_OUTPUT : AC_AMP_SET_INPUT;
+        parm |= index << AC_AMP_SET_INDEX_SHIFT;
+        parm |= val;
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, parm);
+        info->vol[ch] = val;
 }
 
@@ -673 +725 @@
 static int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch, int direction, int index)
 {
-    struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, index));
-    if (! info)
-        return 0;
-    return get_vol_mute(codec, info, nid, ch, direction, index);
+        struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, index));
+        if (! info)
+                return 0;
+        return get_vol_mute(codec, info, nid, ch, direction, index);
 }
 
@@ -684 +736 @@
 static int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch, int direction, int idx, int mask, int val)
 {
-    struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, idx));
-
-    if (! info)
-        return 0;
-    val &= mask;
-    val |= get_vol_mute(codec, info, nid, ch, direction, idx) & ~mask;
-    if (info->vol[ch] == val && ! codec->in_resume)
-        return 0;
-    put_vol_mute(codec, info, nid, ch, direction, idx, val);
-    return 1;
+        struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, idx));
+
+        if (! info)
+                return 0;
+        val &= mask;
+        val |= get_vol_mute(codec, info, nid, ch, direction, idx) & ~mask;
+        if (info->vol[ch] == val && ! codec->in_resume)
+                return 0;
+        put_vol_mute(codec, info, nid, ch, direction, idx, val);
+        return 1;
 }
 
@@ -707 +759 @@
 
 /* volume */
-int snd_hda_mixer_amp_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -728 +780 @@
 }
 
-int snd_hda_mixer_amp_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -744 +796 @@
 }
 
-int snd_hda_mixer_amp_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -754 +806 @@
         int change = 0;
 
-        if (chs & 1)
-            change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
-                                              0x7f, *valp);
-        if (chs & 2)
-            change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
-                                               0x7f, valp[1]);
+        if (chs & 1) {
+                change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
+                                                  0x7f, *valp);
+                valp++;
+        }
+        if (chs & 2)
+                change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
+                                                   0x7f, *valp);
         return change;
 }
 
 /* switch */
-int snd_hda_mixer_amp_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         int chs = get_amp_channels(kcontrol);
@@ -775 +829 @@
 }
 
-int snd_hda_mixer_amp_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -791 +845 @@
 }
 
-int snd_hda_mixer_amp_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -801 +855 @@
         int change = 0;
 
-        if (chs & 1)
-            change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
-                                              0x80, *valp ? 0 : 0x80);
-        if (chs & 2)
-            change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
-                                               0x80, valp[1] ? 0 : 0x80);
+        if (chs & 1) {
+                change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
+                                                  0x80, *valp ? 0 : 0x80);
+                valp++;
+        }
+        if (chs & 2)
+                change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
+                                                   0x80, *valp ? 0 : 0x80);
+        
         return change;
 }
 
 /*
+ * bound volume controls
+ *
+ * bind multiple volumes (# indices, from 0)
+ */
+
+#define AMP_VAL_IDX_SHIFT       19
+#define AMP_VAL_IDX_MASK        (0x0f<<19)
+
+int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        unsigned long pval;
+        int err;
+
+        down(&codec->spdif_mutex); /* reuse spdif_mutex */
+        pval = kcontrol->private_value;
+        kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */
+        err = snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
+        kcontrol->private_value = pval;
+        up(&codec->spdif_mutex);
+        return err;
+}
+
+int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        unsigned long pval;
+        int i, indices, err = 0, change = 0;
+
+        down(&codec->spdif_mutex); /* reuse spdif_mutex */
+        pval = kcontrol->private_value;
+        indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT;
+        for (i = 0; i < indices; i++) {
+                kcontrol->private_value = (pval & ~AMP_VAL_IDX_MASK) | (i << AMP_VAL_IDX_SHIFT);
+                err = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
+                if (err < 0)
+                        break;
+                change |= err;
+        }
+        kcontrol->private_value = pval;
+        up(&codec->spdif_mutex);
+        return err < 0 ? err : change;
+}
+
+/*
  * SPDIF out controls
  */
 
-static int snd_hda_spdif_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int snd_hda_spdif_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
@@ -821 +923 @@
 }
 
-static int snd_hda_spdif_cmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_hda_spdif_cmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |
@@ -832 +934 @@
 }
 
-static int snd_hda_spdif_pmask_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_hda_spdif_pmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |
@@ -840 +942 @@
 }
 
-static int snd_hda_spdif_default_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int snd_hda_spdif_default_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -857 +959 @@
 static unsigned short convert_from_spdif_status(unsigned int sbits)
 {
-    unsigned short val = 0;
-
-    if (sbits & IEC958_AES0_PROFESSIONAL)
-        val |= 1 << 6;
-    if (sbits & IEC958_AES0_NONAUDIO)
-        val |= 1 << 5;
-    if (sbits & IEC958_AES0_PROFESSIONAL) {
-        if ((sbits & IEC958_AES0_PRO_EMPHASIS) == IEC958_AES0_PRO_EMPHASIS_5015)
-            val |= 1 << 3;
-    } else {
-        if ((sbits & IEC958_AES0_CON_EMPHASIS) == IEC958_AES0_CON_EMPHASIS_5015)
-            val |= 1 << 3;
-        if (! (sbits & IEC958_AES0_CON_NOT_COPYRIGHT))
-            val |= 1 << 4;
-        if (sbits & (IEC958_AES1_CON_ORIGINAL << 8))
-            val |= 1 << 7;
-        val |= sbits & (IEC958_AES1_CON_CATEGORY << 8);
-    }
-    return val;
+        unsigned short val = 0;
+
+        if (sbits & IEC958_AES0_PROFESSIONAL)
+                val |= 1 << 6;
+        if (sbits & IEC958_AES0_NONAUDIO)
+                val |= 1 << 5;
+        if (sbits & IEC958_AES0_PROFESSIONAL) {
+                if ((sbits & IEC958_AES0_PRO_EMPHASIS) == IEC958_AES0_PRO_EMPHASIS_5015)
+                        val |= 1 << 3;
+        } else {
+                if ((sbits & IEC958_AES0_CON_EMPHASIS) == IEC958_AES0_CON_EMPHASIS_5015)
+                        val |= 1 << 3;
+                if (! (sbits & IEC958_AES0_CON_NOT_COPYRIGHT))
+                        val |= 1 << 4;
+                if (sbits & (IEC958_AES1_CON_ORIGINAL << 8))
+                        val |= 1 << 7;
+                val |= sbits & (IEC958_AES1_CON_CATEGORY << 8);
+        }
+        return val;
 }
 
@@ -882 +984 @@
 static unsigned int convert_to_spdif_status(unsigned short val)
 {
-    unsigned int sbits = 0;
-
-    if (val & (1 << 5))
-        sbits |= IEC958_AES0_NONAUDIO;
-    if (val & (1 << 6))
-        sbits |= IEC958_AES0_PROFESSIONAL;
-    if (sbits & IEC958_AES0_PROFESSIONAL) {
-        if (sbits & (1 << 3))
-            sbits |= IEC958_AES0_PRO_EMPHASIS_5015;
-    } else {
-        if (val & (1 << 3))
-            sbits |= IEC958_AES0_CON_EMPHASIS_5015;
-        if (! (val & (1 << 4)))
-            sbits |= IEC958_AES0_CON_NOT_COPYRIGHT;
-        if (val & (1 << 7))
-            sbits |= (IEC958_AES1_CON_ORIGINAL << 8);
-        sbits |= val & (0x7f << 8);
-    }
-    return sbits;
-}
-
-static int snd_hda_spdif_default_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    hda_nid_t nid = kcontrol->private_value;
-    unsigned short val;
-    int change;
-
-    down(&codec->spdif_mutex);
-    codec->spdif_status = ucontrol->value.iec958.status[0] |
-        ((unsigned int)ucontrol->value.iec958.status[1] << 8) |
-        ((unsigned int)ucontrol->value.iec958.status[2] << 16) |
-        ((unsigned int)ucontrol->value.iec958.status[3] << 24);
-    val = convert_from_spdif_status(codec->spdif_status);
-    val |= codec->spdif_ctls & 1;
-    change = codec->spdif_ctls != val;
-    codec->spdif_ctls = val;
-
-    if (change || codec->in_resume) {
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val & 0xff);
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_2, val >> 8);
-    }
-
-    up(&codec->spdif_mutex);
-    return change;
-}
-
-static int snd_hda_spdif_out_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{
-    uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-    uinfo->count = 1;
-    uinfo->value.integer.min = 0;
-    uinfo->value.integer.max = 1;
-    return 0;
-}
-
-static int snd_hda_spdif_out_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-
-    ucontrol->value.integer.value[0] = codec->spdif_ctls & 1;
-    return 0;
-}
-
-static int snd_hda_spdif_out_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+        unsigned int sbits = 0;
+
+        if (val & (1 << 5))
+                sbits |= IEC958_AES0_NONAUDIO;
+        if (val & (1 << 6))
+                sbits |= IEC958_AES0_PROFESSIONAL;
+        if (sbits & IEC958_AES0_PROFESSIONAL) {
+                if (sbits & (1 << 3))
+                        sbits |= IEC958_AES0_PRO_EMPHASIS_5015;
+        } else {
+                if (val & (1 << 3))
+                        sbits |= IEC958_AES0_CON_EMPHASIS_5015;
+                if (! (val & (1 << 4)))
+                        sbits |= IEC958_AES0_CON_NOT_COPYRIGHT;
+                if (val & (1 << 7))
+                        sbits |= (IEC958_AES1_CON_ORIGINAL << 8);
+                sbits |= val & (0x7f << 8);
+        }
+        return sbits;
+}
+
+static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value;
-        unsigned short val;
+        hda_nid_t nid = kcontrol->private_value;
+        unsigned short val;
         int change;
 
-        down(&codec->spdif_mutex);
-        val = codec->spdif_ctls & ~1;
-        if (ucontrol->value.integer.value[0])
-            val |= 1;
-        change = codec->spdif_ctls != val;
-        if (change || codec->in_resume) {
-            codec->spdif_ctls = val;
-            snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val & 0xff);
-            snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT |
-                                AC_AMP_SET_OUTPUT | ((val & 1) ? 0 : 0x80));
-        }
+        down(&codec->spdif_mutex);
+        codec->spdif_status = ucontrol->value.iec958.status[0] |
+                ((unsigned int)ucontrol->value.iec958.status[1] << 8) |
+                ((unsigned int)ucontrol->value.iec958.status[2] << 16) |
+                ((unsigned int)ucontrol->value.iec958.status[3] << 24);
+        val = convert_from_spdif_status(codec->spdif_status);
+        val |= codec->spdif_ctls & 1;
+        change = codec->spdif_ctls != val;
+        codec->spdif_ctls = val;
+
+        if (change || codec->in_resume) {
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val & 0xff);
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_2, val >> 8);
+        }
+
         up(&codec->spdif_mutex);
         return change;
 }
 
-static snd_kcontrol_new_t dig_mixes[] = {
+static int snd_hda_spdif_out_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int snd_hda_spdif_out_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.integer.value[0] = codec->spdif_ctls & 1;
+        return 0;
+}
+
+static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value;
+        unsigned short val;
+        int change;
+
+        down(&codec->spdif_mutex);
+        val = codec->spdif_ctls & ~1;
+        if (ucontrol->value.integer.value[0])
+                val |= 1;
+        change = codec->spdif_ctls != val;
+        if (change || codec->in_resume) {
+                codec->spdif_ctls = val;
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val & 0xff);
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                    AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT |
+                                    AC_AMP_SET_OUTPUT | ((val & 1) ? 0 : 0x80));
+        }
+        up(&codec->spdif_mutex);
+        return change;
+}
+
+static struct snd_kcontrol_new dig_mixes[] = {
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-                /*.name = */SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),0,
-                /*.access = */SNDRV_CTL_ELEM_ACCESS_READ,0,
-                /*.info = */snd_hda_spdif_mask_info,
-                /*.get = */snd_hda_spdif_cmask_get,0,0
+                .access = SNDRV_CTL_ELEM_ACCESS_READ,
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+                .info = snd_hda_spdif_mask_info,
+                .get = snd_hda_spdif_cmask_get,
         },
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-                /*.name = */SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),0,
-                /*.access = */SNDRV_CTL_ELEM_ACCESS_READ,0,
-                /*.info = */snd_hda_spdif_mask_info,
-                /*.get = */snd_hda_spdif_pmask_get,0,0
+                .access = SNDRV_CTL_ELEM_ACCESS_READ,
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
+                .info = snd_hda_spdif_mask_info,
+                .get = snd_hda_spdif_pmask_get,
         },
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-                /*.name = */SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),0,0,0,
-                /*.info = */snd_hda_spdif_mask_info,
-                /*.get = */snd_hda_spdif_default_get,
-                /*.put = */snd_hda_spdif_default_put,0
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+                .info = snd_hda_spdif_mask_info,
+                .get = snd_hda_spdif_default_get,
+                .put = snd_hda_spdif_default_put,
         },
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-                /*.name = */SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH),0,0,0,
-                /*.info = */snd_hda_spdif_out_switch_info,
-                /*.get = */snd_hda_spdif_out_switch_get,
-                /*.put = */snd_hda_spdif_out_switch_put,0
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH),
+                .info = snd_hda_spdif_out_switch_info,
+                .get = snd_hda_spdif_out_switch_get,
+                .put = snd_hda_spdif_out_switch_put,
         },
         {0} /* end */
@@ -1014 +1116 @@
 {
         int err;
-        snd_kcontrol_t *kctl;
-        snd_kcontrol_new_t *dig_mix;
+        struct snd_kcontrol *kctl;
+        struct snd_kcontrol_new *dig_mix;
 
         for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) {
@@ -1022 +1124 @@
                 if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
                         return err;
-        }
-        codec->spdif_ctls = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0);
-        codec->spdif_status = convert_to_spdif_status(codec->spdif_ctls);
+        }
+        codec->spdif_ctls = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0);
+        codec->spdif_status = convert_to_spdif_status(codec->spdif_ctls);
         return 0;
 }
@@ -1032 +1134 @@
  */
 
-#define snd_hda_spdif_in_switch_info    snd_hda_spdif_out_switch_info
-
-static int snd_hda_spdif_in_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-
-    ucontrol->value.integer.value[0] = codec->spdif_in_enable;
-    return 0;
-}
-
-static int snd_hda_spdif_in_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    hda_nid_t nid = kcontrol->private_value;
-    unsigned int val = !!ucontrol->value.integer.value[0];
-    int change;
-
-    down(&codec->spdif_mutex);
-    change = codec->spdif_in_enable != val;
-    if (change || codec->in_resume) {
-        codec->spdif_in_enable = val;
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val);
-    }
-    up(&codec->spdif_mutex);
-    return change;
-}
-
-static int snd_hda_spdif_in_status_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    hda_nid_t nid = kcontrol->private_value;
-    unsigned short val;
-    unsigned int sbits;
-
-    val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0);
-    sbits = convert_to_spdif_status(val);
-    ucontrol->value.iec958.status[0] = sbits;
-    ucontrol->value.iec958.status[1] = sbits >> 8;
-    ucontrol->value.iec958.status[2] = sbits >> 16;
-    ucontrol->value.iec958.status[3] = sbits >> 24;
-    return 0;
-}
-
-static snd_kcontrol_new_t dig_in_ctls[] = {
-    {
-        SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH),0,0,0,
-        snd_hda_spdif_in_switch_info,
-        snd_hda_spdif_in_switch_get,
-        snd_hda_spdif_in_switch_put,0
-    },
-    {
-        SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        SNDRV_CTL_NAME_IEC958("",CAPTURE,DEFAULT),0,
-        SNDRV_CTL_ELEM_ACCESS_READ,0,
-        snd_hda_spdif_mask_info,
-        snd_hda_spdif_in_status_get,0,0
-    },
-    {0} /* end */
+#define snd_hda_spdif_in_switch_info    snd_hda_spdif_out_switch_info
+
+static int snd_hda_spdif_in_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.integer.value[0] = codec->spdif_in_enable;
+        return 0;
+}
+
+static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value;
+        unsigned int val = !!ucontrol->value.integer.value[0];
+        int change;
+
+        down(&codec->spdif_mutex);
+        change = codec->spdif_in_enable != val;
+        if (change || codec->in_resume) {
+                codec->spdif_in_enable = val;
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val);
+        }
+        up(&codec->spdif_mutex);
+        return change;
+}
+
+static int snd_hda_spdif_in_status_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value;
+        unsigned short val;
+        unsigned int sbits;
+
+        val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0);
+        sbits = convert_to_spdif_status(val);
+        ucontrol->value.iec958.status[0] = sbits;
+        ucontrol->value.iec958.status[1] = sbits >> 8;
+        ucontrol->value.iec958.status[2] = sbits >> 16;
+        ucontrol->value.iec958.status[3] = sbits >> 24;
+        return 0;
+}
+
+static struct snd_kcontrol_new dig_in_ctls[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH),
+                .info = snd_hda_spdif_in_switch_info,
+                .get = snd_hda_spdif_in_switch_get,
+                .put = snd_hda_spdif_in_switch_put,
+        },
+        {
+                .access = SNDRV_CTL_ELEM_ACCESS_READ,
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,DEFAULT),
+                .info = snd_hda_spdif_mask_info,
+                .get = snd_hda_spdif_in_status_get,
+        },
+        {0} /* end */
 };
 
@@ -1105 +1207 @@
 int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
 {
-    int err;
-    snd_kcontrol_t *kctl;
-    snd_kcontrol_new_t *dig_mix;
-
-    for (dig_mix = dig_in_ctls; dig_mix->name; dig_mix++) {
-        kctl = snd_ctl_new1(dig_mix, codec);
-        kctl->private_value = nid;
-        if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
-            return err;
-    }
-    codec->spdif_in_enable = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0) & 1;
-    return 0;
-}
+        int err;
+        struct snd_kcontrol *kctl;
+        struct snd_kcontrol_new *dig_mix;
+
+        for (dig_mix = dig_in_ctls; dig_mix->name; dig_mix++) {
+                kctl = snd_ctl_new1(dig_mix, codec);
+                kctl->private_value = nid;
+                if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
+                        return err;
+        }
+        codec->spdif_in_enable = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0) & 1;
+        return 0;
+}
+
+
+/*
+ * set power state of the codec
+ */
+static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
+                                unsigned int power_state)
+{
+        hda_nid_t nid, nid_start;
+        int nodes;
+
+        snd_hda_codec_write(codec, fg, 0, AC_VERB_SET_POWER_STATE,
+                            power_state);
+
+        nodes = snd_hda_get_sub_nodes(codec, fg, &nid_start);
+        for (nid = nid_start; nid < nodes + nid_start; nid++) {
+                if (get_wcaps(codec, nid) & AC_WCAP_POWER)
+                        snd_hda_codec_write(codec, nid, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            power_state);
+        }
+
+        if (power_state == AC_PWRST_D0)
+                msleep(10);
+}
+
 
 /**
@@ -1146 +1274 @@
                 struct hda_codec *codec = list_entry(p, struct hda_codec, list);
                 int err;
+                hda_set_power_state(codec,
+                                    codec->afg ? codec->afg : codec->mfg,
+                                    AC_PWRST_D0);
                 if (! codec->patch_ops.init)
                         continue;
@@ -1159 +1290 @@
  * stream formats
  */
-static unsigned int rate_bits[][3] = {
+struct hda_rate_tbl {
+        unsigned int hz;
+        unsigned int alsa_bits;
+        unsigned int hda_fmt;
+};
+
+static struct hda_rate_tbl rate_bits[] = {
         /* rate in Hz, ALSA rate bitmask, HDA format value */
+
+        /* autodetected value used in snd_hda_query_supported_pcm */
         { 8000, SNDRV_PCM_RATE_8000, 0x0500 }, /* 1/6 x 48 */
         { 11025, SNDRV_PCM_RATE_11025, 0x4300 }, /* 1/4 x 44 */
@@ -1172 +1311 @@
         { 176400, SNDRV_PCM_RATE_176400, 0x5800 },/* 4 x 44 */
         { 192000, SNDRV_PCM_RATE_192000, 0x1800 }, /* 4 x 48 */
-        { 0 }
+
+        /* not autodetected value */
+        { 9600, SNDRV_PCM_RATE_KNOT, 0x0400 }, /* 1/5 x 48 */
+
+        { 0 } /* terminator */
 };
 
@@ -1194 +1337 @@
         unsigned int val = 0;
 
-        for (i = 0; rate_bits[i][0]; i++)
-                if (rate_bits[i][0] == rate) {
-                        val = rate_bits[i][2];
+        for (i = 0; rate_bits[i].hz; i++)
+                if (rate_bits[i].hz == rate) {
+                        val = rate_bits[i].hda_fmt;
                         break;
                 }
-        if (! rate_bits[i][0]) {
+        if (! rate_bits[i].hz) {
                 snd_printdd("invalid rate %d\n", rate);
                 return 0;
@@ -1252 +1395 @@
         val = 0;
         if (nid != codec->afg &&
-            snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP) & AC_WCAP_FORMAT_OVRD) {
+            (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD)) {
                 val = snd_hda_param_read(codec, nid, AC_PAR_PCM);
                 if (val == -1)
@@ -1262 +1405 @@
         if (ratesp) {
                 u32 rates = 0;
-                for (i = 0; rate_bits[i][0]; i++) {
+                for (i = 0; rate_bits[i].hz; i++) {
                         if (val & (1 << i))
-                                rates |= rate_bits[i][1];
+                                rates |= rate_bits[i].alsa_bits;
                 }
                 *ratesp = rates;
@@ -1274 +1417 @@
                 unsigned int wcaps;
 
-                wcaps = snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP);
+                wcaps = get_wcaps(codec, nid);
                 streams = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
                 if (streams == -1)
@@ -1341 +1484 @@
 {
         int i;
-        unsigned int val = 0, rate, stream;
+        unsigned int val = 0, rate, stream;
 
         if (nid != codec->afg &&
-            snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP) & AC_WCAP_FORMAT_OVRD) {
+            (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD)) {
                 val = snd_hda_param_read(codec, nid, AC_PAR_PCM);
                 if (val == -1)
@@ -1355 +1498 @@
         }
 
-        rate = format & 0xff00;
-        for (i = 0; rate_bits[i][0]; i++)
-                if (rate_bits[i][2] == rate) {
+        rate = format & 0xff00;
+        for (i = 0; rate_bits[i].hz; i++)
+                if (rate_bits[i].hda_fmt == rate) {
                         if (val & (1 << i))
                                 break;
                         return 0;
                 }
-        if (! rate_bits[i][0])
+        if (! rate_bits[i].hz)
                 return 0;
 
-        stream = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
-        if (stream == -1)
-            return 0;
-        if (! stream && nid != codec->afg)
-            stream = snd_hda_param_read(codec, codec->afg, AC_PAR_STREAM);
-        if (! stream || stream == -1)
-            return 0;
-
-        if (stream & AC_SUPFMT_PCM) {
+        stream = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
+        if (stream == -1)
+                return 0;
+        if (! stream && nid != codec->afg)
+                stream = snd_hda_param_read(codec, codec->afg, AC_PAR_STREAM);
+        if (! stream || stream == -1)
+                return 0;
+
+        if (stream & AC_SUPFMT_PCM) {
                 switch (format & 0xf0) {
                 case 0x00:
@@ -1410 +1553 @@
 static int hda_pcm_default_open_close(struct hda_pcm_stream *hinfo,
                                       struct hda_codec *codec,
-                                      snd_pcm_substream_t *substream)
+                                      struct snd_pcm_substream *substream)
 {
         return 0;
@@ -1419 +1562 @@
                                    unsigned int stream_tag,
                                    unsigned int format,
-                                   snd_pcm_substream_t *substream)
+                                   struct snd_pcm_substream *substream)
 {
         snd_hda_codec_setup_stream(codec, hinfo->nid, stream_tag, 0, format);
@@ -1427 +1570 @@
 static int hda_pcm_default_cleanup(struct hda_pcm_stream *hinfo,
                                    struct hda_codec *codec,
-                                   snd_pcm_substream_t *substream)
+                                   struct snd_pcm_substream *substream)
 {
         snd_hda_codec_setup_stream(codec, hinfo->nid, 0, 0, 0);
@@ -1524 +1667 @@
  * If no entries are matching, the function returns a negative value.
  */
-int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config *tbl)
-{
-        struct hda_board_config *c;
+int snd_hda_check_board_config(struct hda_codec *codec, const struct hda_board_config *tbl)
+{
+        const struct hda_board_config *c;
 
         if (codec->bus->modelname) {
-                for (c = tbl; c->modelname || c->pci_vendor; c++) {
+                for (c = tbl; c->modelname || c->pci_subvendor; c++) {
                         if (c->modelname &&
                             ! strcmp(codec->bus->modelname, c->modelname)) {
@@ -1542 +1685 @@
                 pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
                 pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_ID, &subsystem_device);
-                for (c = tbl; c->modelname || c->pci_vendor; c++) {
-                        if (c->pci_vendor == subsystem_vendor &&
-                            c->pci_device == subsystem_device)
+                for (c = tbl; c->modelname || c->pci_subvendor; c++) {
+                        if (c->pci_subvendor == subsystem_vendor &&
+                            (! c->pci_subdevice /* all match */||
+                             (c->pci_subdevice == subsystem_device))) {
+                                snd_printdd(KERN_INFO "hda_codec: PCI %x:%x, codec config %d is selected\n",
+                                            subsystem_vendor, subsystem_device, c->config);
                                 return c->config;
+                        }
                 }
         }
@@ -1554 +1701 @@
  * snd_hda_add_new_ctls - create controls from the array
  * @codec: the HDA codec
- * @knew: the array of snd_kcontrol_new_t
+ * @knew: the array of struct snd_kcontrol_new
  *
  * This helper function creates and add new controls in the given array.
@@ -1561 +1708 @@
  * Returns 0 if successful, or a negative error code.
  */
-int snd_hda_add_new_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew)
+int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)
 {
         int err;
 
         for (; knew->name; knew++) {
-                err = snd_ctl_add(codec->bus->card, snd_ctl_new1(knew, codec));
-                if (err < 0)
-                        return err;
-        }
-        return 0;
-}
-
+                struct snd_kcontrol *kctl;
+                kctl = snd_ctl_new1(knew, codec);
+                if (! kctl)
+                        return -ENOMEM;
+                err = snd_ctl_add(codec->bus->card, kctl);
+                if (err < 0) {
+                        if (! codec->addr)
+                                return err;
+                        kctl = snd_ctl_new1(knew, codec);
+                        if (! kctl)
+                                return -ENOMEM;
+                        kctl->id.device = codec->addr;
+                        if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
+                                return err;
+                }
+        }
+        return 0;
+}
+
+
+/*
+ * Channel mode helper
+ */
+int snd_hda_ch_mode_info(struct hda_codec *codec, struct snd_ctl_elem_info *uinfo,
+                         const struct hda_channel_mode *chmode, int num_chmodes)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = num_chmodes;
+        if (uinfo->value.enumerated.item >= num_chmodes)
+                uinfo->value.enumerated.item = num_chmodes - 1;
+        sprintf(uinfo->value.enumerated.name, "%dch",
+                chmode[uinfo->value.enumerated.item].channels);
+        return 0;
+}
+
+int snd_hda_ch_mode_get(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,
+                        const struct hda_channel_mode *chmode, int num_chmodes,
+                        int max_channels)
+{
+        int i;
+
+        for (i = 0; i < num_chmodes; i++) {
+                if (max_channels == chmode[i].channels) {
+                        ucontrol->value.enumerated.item[0] = i;
+                        break;
+                }
+        }
+        return 0;
+}
+
+int snd_hda_ch_mode_put(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,
+                        const struct hda_channel_mode *chmode, int num_chmodes,
+                        int *max_channelsp)
+{
+        unsigned int mode;
+
+        mode = ucontrol->value.enumerated.item[0];
+        snd_assert(mode < num_chmodes, return -EINVAL);
+        if (*max_channelsp == chmode[mode].channels && ! codec->in_resume)
+                return 0;
+        /* change the current channel setting */
+        *max_channelsp = chmode[mode].channels;
+        if (chmode[mode].sequence)
+                snd_hda_sequence_write(codec, chmode[mode].sequence);
+        return 1;
+}
 
 /*
  * input MUX helper
  */
-int snd_hda_input_mux_info(const struct hda_input_mux *imux, snd_ctl_elem_info_t *uinfo)
+int snd_hda_input_mux_info(const struct hda_input_mux *imux, struct snd_ctl_elem_info *uinfo)
 {
         unsigned int index;
@@ -1592 +1799 @@
 
 int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *imux,
-                          snd_ctl_elem_value_t *ucontrol, hda_nid_t nid,
+                          struct snd_ctl_elem_value *ucontrol, hda_nid_t nid,
                           unsigned int *cur_val)
 {
@@ -1643 +1850 @@
  */
 int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out *mout,
-                                  snd_pcm_substream_t *substream)
+                                  struct snd_pcm_substream *substream)
 {
         substream->runtime->hw.channels_max = mout->max_channels;
@@ -1657 +1864 @@
                                      unsigned int stream_tag,
                                      unsigned int format,
-                                     snd_pcm_substream_t *substream)
+                                     struct snd_pcm_substream *substream)
 {
         hda_nid_t *nids = mout->dac_nids;
@@ -1665 +1872 @@
         down(&codec->spdif_mutex);
         if (mout->dig_out_nid && mout->dig_out_used != HDA_DIG_EXCLUSIVE) {
-            if (chs == 2 &&
-                snd_hda_is_supported_format(codec, mout->dig_out_nid, format) &&
-                             ! (codec->spdif_status & IEC958_AES0_NONAUDIO)) {
-
+                if (chs == 2 &&
+                    snd_hda_is_supported_format(codec, mout->dig_out_nid, format) &&
+                    ! (codec->spdif_status & IEC958_AES0_NONAUDIO)) {
                         mout->dig_out_used = HDA_DIG_ANALOG_DUP;
                         /* setup digital receiver */
                         snd_hda_codec_setup_stream(codec, mout->dig_out_nid,
                                                    stream_tag, 0, format);
-
                 } else {
                         mout->dig_out_used = 0;
@@ -1687 +1892 @@
                 snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag, 0, format);
         /* surrounds */
-        for (i = 0; i < mout->num_dacs; i++) {
-                if (i == HDA_REAR && chs == 2) /* copy front to rear */
-                        snd_hda_codec_setup_stream(codec, nids[i], stream_tag, 0, format);
-                else if (chs >= (i + 1) * 2) /* independent out */
+        for (i = 1; i < mout->num_dacs; i++) {
+                if (chs >= (i + 1) * 2) /* independent out */
                         snd_hda_codec_setup_stream(codec, nids[i], stream_tag, i * 2,
+                                                   format);
+                else /* copy front */
+                        snd_hda_codec_setup_stream(codec, nids[i], stream_tag, 0,
                                                    format);
         }
@@ -1718 +1924 @@
 }
 
+/*
+ * Helper for automatic ping configuration
+ */
+
+static int is_in_nid_list(hda_nid_t nid, hda_nid_t *list)
+{
+        for (; *list; list++)
+                if (*list == nid)
+                        return 1;
+        return 0;
+}
+
+/* parse all pin widgets and store the useful pin nids to cfg */
+int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *cfg,
+                                 hda_nid_t *ignore_nids)
+{
+        hda_nid_t nid, nid_start;
+        int i, j, nodes;
+        short seq, sequences[4], assoc_line_out;
+
+        memset(cfg, 0, sizeof(*cfg));
+
+        memset(sequences, 0, sizeof(sequences));
+        assoc_line_out = 0;
+
+        nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid_start);
+        for (nid = nid_start; nid < nodes + nid_start; nid++) {
+                unsigned int wid_caps = get_wcaps(codec, nid);
+                unsigned int wid_type = (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+                unsigned int def_conf;
+                short assoc, loc;
+
+                /* read all default configuration for pin complex */
+                if (wid_type != AC_WID_PIN)
+                        continue;
+                /* ignore the given nids (e.g. pc-beep returns error) */
+                if (ignore_nids && is_in_nid_list(nid, ignore_nids))
+                        continue;
+
+                def_conf = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)
+                        continue;
+                loc = get_defcfg_location(def_conf);
+                switch (get_defcfg_device(def_conf)) {
+                case AC_JACK_LINE_OUT:
+                        seq = get_defcfg_sequence(def_conf);
+                        assoc = get_defcfg_association(def_conf);
+                        if (! assoc)
+                                continue;
+                        if (! assoc_line_out)
+                                assoc_line_out = assoc;
+                        else if (assoc_line_out != assoc)
+                                continue;
+                        if (cfg->line_outs >= ARRAY_SIZE(cfg->line_out_pins))
+                                continue;
+                        cfg->line_out_pins[cfg->line_outs] = nid;
+                        sequences[cfg->line_outs] = seq;
+                        cfg->line_outs++;
+                        break;
+                case AC_JACK_SPEAKER:
+                        cfg->speaker_pin = nid;
+                        break;
+                case AC_JACK_HP_OUT:
+                        cfg->hp_pin = nid;
+                        break;
+                case AC_JACK_MIC_IN:
+                        if (loc == AC_JACK_LOC_FRONT)
+                                cfg->input_pins[AUTO_PIN_FRONT_MIC] = nid;
+                        else
+                                cfg->input_pins[AUTO_PIN_MIC] = nid;
+                        break;
+                case AC_JACK_LINE_IN:
+                        if (loc == AC_JACK_LOC_FRONT)
+                                cfg->input_pins[AUTO_PIN_FRONT_LINE] = nid;
+                        else
+                                cfg->input_pins[AUTO_PIN_LINE] = nid;
+                        break;
+                case AC_JACK_CD:
+                        cfg->input_pins[AUTO_PIN_CD] = nid;
+                        break;
+                case AC_JACK_AUX:
+                        cfg->input_pins[AUTO_PIN_AUX] = nid;
+                        break;
+                case AC_JACK_SPDIF_OUT:
+                        cfg->dig_out_pin = nid;
+                        break;
+                case AC_JACK_SPDIF_IN:
+                        cfg->dig_in_pin = nid;
+                        break;
+                }
+        }
+
+        /* sort by sequence */
+        for (i = 0; i < cfg->line_outs; i++)
+                for (j = i + 1; j < cfg->line_outs; j++)
+                        if (sequences[i] > sequences[j]) {
+                                seq = sequences[i];
+                                sequences[i] = sequences[j];
+                                sequences[j] = seq;
+                                nid = cfg->line_out_pins[i];
+                                cfg->line_out_pins[i] = cfg->line_out_pins[j];
+                                cfg->line_out_pins[j] = nid;
+                        }
+
+        /* Reorder the surround channels
+         * ALSA sequence is front/surr/clfe/side
+         * HDA sequence is:
+         *    4-ch: front/surr  =>  OK as it is
+         *    6-ch: front/clfe/surr
+         *    8-ch: front/clfe/side/surr
+         */
+        switch (cfg->line_outs) {
+        case 3:
+                nid = cfg->line_out_pins[1];
+                cfg->line_out_pins[1] = cfg->line_out_pins[2];
+                cfg->line_out_pins[2] = nid;
+                break;
+        case 4:
+                nid = cfg->line_out_pins[1];
+                cfg->line_out_pins[1] = cfg->line_out_pins[3];
+                cfg->line_out_pins[3] = cfg->line_out_pins[2];
+                cfg->line_out_pins[2] = nid;
+                break;
+        }
+
+        return 0;
+}
+
+/* labels for input pins */
+const char *auto_pin_cfg_labels[AUTO_PIN_LAST] = {
+        "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux"
+};
+
+
 #ifdef CONFIG_PM
 /*
@@ -1730 +2070 @@
  * Returns 0 if successful.
  */
-int snd_hda_suspend(struct hda_bus *bus, unsigned int state)
+int snd_hda_suspend(struct hda_bus *bus, pm_message_t state)
 {
         struct list_head *p;
@@ -1739 +2079 @@
                 if (codec->patch_ops.suspend)
                         codec->patch_ops.suspend(codec, state);
+                hda_set_power_state(codec,
+                                    codec->afg ? codec->afg : codec->mfg,
+                                    AC_PWRST_D3);
         }
         return 0;
@@ -1750 +2093 @@
  * Returns 0 if successful.
  */
-int snd_hda_resume(struct hda_bus *bus, unsigned int state)
+int snd_hda_resume(struct hda_bus *bus)
 {
         struct list_head *p;
@@ -1756 +2099 @@
         list_for_each(p, &bus->codec_list) {
                 struct hda_codec *codec = list_entry(p, struct hda_codec, list);
+                hda_set_power_state(codec,
+                                    codec->afg ? codec->afg : codec->mfg,
+                                    AC_PWRST_D0);
                 if (codec->patch_ops.resume)
                         codec->patch_ops.resume(codec);
@@ -1765 +2111 @@
  * snd_hda_resume_ctls - resume controls in the new control list
  * @codec: the HDA codec
- * @knew: the array of snd_kcontrol_new_t
- *
- * This function resumes the mixer controls in the snd_kcontrol_new_t array,
+ * @knew: the array of struct snd_kcontrol_new
+ *
+ * This function resumes the mixer controls in the struct snd_kcontrol_new array,
  * originally for snd_hda_add_new_ctls().
  * The array must be terminated with an empty entry as terminator.
  */
-int snd_hda_resume_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew)
-{
-        snd_ctl_elem_value_t *val;
+int snd_hda_resume_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)
+{
+        struct snd_ctl_elem_value *val;
 
         val = kmalloc(sizeof(*val), GFP_KERNEL);
@@ -1817 +2163 @@
 int snd_hda_resume_spdif_in(struct hda_codec *codec)
 {
-    return snd_hda_resume_ctls(codec, dig_in_ctls);
+        return snd_hda_resume_ctls(codec, dig_in_ctls);
 }
 #endif

GPL/trunk/alsa-kernel/pci/hda/hda_codec.h

@@ -76 +76 @@
 #define AC_VERB_GET_VOLUME_KNOB_CONTROL         0x0f0f
 /* f10-f1a: GPIO */
+#define AC_VERB_GET_GPIO_DATA                   0x0f15
+#define AC_VERB_GET_GPIO_MASK                   0x0f16
+#define AC_VERB_GET_GPIO_DIRECTION              0x0f17
 #define AC_VERB_GET_CONFIG_DEFAULT              0x0f1c
+/* f20: AFG/MFG */
+#define AC_VERB_GET_SUBSYSTEM_ID                0x0f20
 
 /*
@@ -94 +99 @@
 #define AC_VERB_SET_PIN_SENSE                   0x709
 #define AC_VERB_SET_BEEP_CONTROL                0x70a
-#define AC_VERB_SET_EAPD_BTLENALBE              0x70c
+#define AC_VERB_SET_EAPD_BTLENABLE              0x70c
 #define AC_VERB_SET_DIGI_CONVERT_1              0x70d
 #define AC_VERB_SET_DIGI_CONVERT_2              0x70e
 #define AC_VERB_SET_VOLUME_KNOB_CONTROL         0x70f
+#define AC_VERB_SET_GPIO_DATA                   0x715
+#define AC_VERB_SET_GPIO_MASK                   0x716
+#define AC_VERB_SET_GPIO_DIRECTION              0x717
 #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_0      0x71c
 #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_1      0x71d
@@ -177 +185 @@
 #define AC_PINCAP_IN                    (1<<5)  /* input capable */
 #define AC_PINCAP_BALANCE               (1<<6)  /* balanced I/O capable */
-#define AC_PINCAP_VREF                  (0x37<<8)
+#define AC_PINCAP_VREF                  (0x37<<8)
 #define AC_PINCAP_VREF_SHIFT            8
 #define AC_PINCAP_EAPD                  (1<<16) /* EAPD capable */
 /* Vref status (used in pin cap) */
-#define AC_PINCAP_VREF_HIZ              (1<<0)  /* Hi-Z */
-#define AC_PINCAP_VREF_50               (1<<1)  /* 50% */
-#define AC_PINCAP_VREF_GRD              (1<<2)  /* ground */
-#define AC_PINCAP_VREF_80               (1<<4)  /* 80% */
-#define AC_PINCAP_VREF_100              (1<<5)  /* 100% */
+#define AC_PINCAP_VREF_HIZ              (1<<0)  /* Hi-Z */
+#define AC_PINCAP_VREF_50               (1<<1)  /* 50% */
+#define AC_PINCAP_VREF_GRD              (1<<2)  /* ground */
+#define AC_PINCAP_VREF_80               (1<<4)  /* 80% */
+#define AC_PINCAP_VREF_100              (1<<5)  /* 100% */
 
 /* Amplifier capabilities */
@@ -206 +214 @@
 #define AC_PWRST_D2SUP                  (1<<2)
 #define AC_PWRST_D3SUP                  (1<<3)
+
+/* Power state values */
+#define AC_PWRST_D0                     0x00
+#define AC_PWRST_D1                     0x01
+#define AC_PWRST_D2                     0x02
+#define AC_PWRST_D3                     0x03
 
 /* Processing capabilies */
@@ -257 +271 @@
 #define AC_PINCTL_HP_EN                 (1<<7)
 
+/* Unsolicited response - 8bit */
+#define AC_USRSP_EN                     (1<<7)
+
 /* configuration default - 32bit */
 #define AC_DEFCFG_SEQUENCE              (0xf<<0)
 #define AC_DEFCFG_DEF_ASSOC             (0xf<<4)
-#define AC_DEFCFG_ASSOC_SHIFT           4
+#define AC_DEFCFG_ASSOC_SHIFT           4
 #define AC_DEFCFG_MISC                  (0xf<<8)
-#define AC_DEFCFG_MISC_SHIFT            8
+#define AC_DEFCFG_MISC_SHIFT            8
 #define AC_DEFCFG_COLOR                 (0xf<<12)
 #define AC_DEFCFG_COLOR_SHIFT           12
@@ -366 +383 @@
 
 /* max. connections to a widget */
-#define HDA_MAX_CONNECTIONS     16
+#define HDA_MAX_CONNECTIONS     32
 
 /* max. codec address */
@@ -410 +427 @@
  */
 struct hda_bus {
-        snd_card_t *card;
+        struct snd_card *card;
 
         /* copied from template */
@@ -419 +436 @@
 
         /* codec linked list */
-        struct list_head codec_list;
-        struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; /* caddr -> codec */
+        struct list_head codec_list;
+        struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; /* caddr -> codec */
 
         struct semaphore cmd_mutex;
@@ -427 +444 @@
         struct hda_bus_unsolicited *unsol;
 
-        snd_info_entry_t *proc;
+        struct snd_info_entry *proc;
 };
 
@@ -454 +471 @@
         void (*unsol_event)(struct hda_codec *codec, unsigned int res);
 #ifdef CONFIG_PM
-        int (*suspend)(struct hda_codec *codec, unsigned int state);
+        int (*suspend)(struct hda_codec *codec, pm_message_t state);
         int (*resume)(struct hda_codec *codec);
 #endif
@@ -471 +488 @@
 struct hda_pcm_ops {
         int (*open)(struct hda_pcm_stream *info, struct hda_codec *codec,
-                    snd_pcm_substream_t *substream);
+                    struct snd_pcm_substream *substream);
         int (*close)(struct hda_pcm_stream *info, struct hda_codec *codec,
-                     snd_pcm_substream_t *substream);
+                     struct snd_pcm_substream *substream);
         int (*prepare)(struct hda_pcm_stream *info, struct hda_codec *codec,
                        unsigned int stream_tag, unsigned int format,
-                       snd_pcm_substream_t *substream);
+                       struct snd_pcm_substream *substream);
         int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
-                       snd_pcm_substream_t *substream);
+                       struct snd_pcm_substream *substream);
 };
 
@@ -497 +514 @@
         char *name;
         struct hda_pcm_stream stream[2];
+        unsigned int is_modem;  /* modem codec? */
 };
 
@@ -506 +524 @@
 
         hda_nid_t afg;  /* AFG node id */
+        hda_nid_t mfg;  /* MFG node id */
 
         /* ids */
@@ -530 +549 @@
         void *spec;
 
+        /* widget capabilities cache */
+        unsigned int num_nodes;
+        hda_nid_t start_nid;
+        u32 *wcaps;
+
         /* hash for amp access */
         u16 amp_hash[32];
         int num_amp_entries;
-        struct hda_amp_info amp_info[128]; /* big enough? */
+        int amp_info_size;
+        struct hda_amp_info *amp_info;
 
         struct semaphore spdif_mutex;
-        unsigned int spdif_status;
-        unsigned short spdif_ctls;      /* SPDIF control bits */
-        unsigned int spdif_in_enable;   /* SPDIF input enable? */
+        unsigned int spdif_status;      /* IEC958 status bits */
+        unsigned short spdif_ctls;      /* SPDIF control bits */
+        unsigned int spdif_in_enable;   /* SPDIF input enable? */
 };
 
@@ -550 +575 @@
  * constructors
  */
-int snd_hda_bus_new(snd_card_t *card, const struct hda_bus_template *temp,
+int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,
                     struct hda_bus **busp);
 int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
@@ -604 +629 @@
  */
 #ifdef CONFIG_PM
-int snd_hda_suspend(struct hda_bus *bus, unsigned int state);
-int snd_hda_resume(struct hda_bus *bus, unsigned int state);
+int snd_hda_suspend(struct hda_bus *bus, pm_message_t state);
+int snd_hda_resume(struct hda_bus *bus);
 #endif
 

GPL/trunk/alsa-kernel/pci/hda/hda_generic.c

@@ -31 +31 @@
 /* widget node for parsing */
 struct hda_gnode {
-    hda_nid_t nid;              /* NID of this widget */
-    unsigned short nconns;      /* number of input connections */
-    hda_nid_t conn_list[HDA_MAX_CONNECTIONS]; /* input connections */
-    unsigned int wid_caps;      /* widget capabilities */
-    unsigned char type; /* widget type */
-    unsigned char pin_ctl;      /* pin controls */
-    unsigned char checked;      /* the flag indicates that the node is already parsed */
-    unsigned int pin_caps;      /* pin widget capabilities */
-    unsigned int def_cfg;       /* default configuration */
-    unsigned int amp_out_caps;  /* AMP out capabilities */
-    unsigned int amp_in_caps;   /* AMP in capabilities */
-    struct list_head list;
+        hda_nid_t nid;          /* NID of this widget */
+        unsigned short nconns;  /* number of input connections */
+        hda_nid_t *conn_list;
+        hda_nid_t slist[2];     /* temporay list */
+        unsigned int wid_caps;  /* widget capabilities */
+        unsigned char type;     /* widget type */
+        unsigned char pin_ctl;  /* pin controls */
+        unsigned char checked;  /* the flag indicates that the node is already parsed */
+        unsigned int pin_caps;  /* pin widget capabilities */
+        unsigned int def_cfg;   /* default configuration */
+        unsigned int amp_out_caps;      /* AMP out capabilities */
+        unsigned int amp_in_caps;       /* AMP in capabilities */
+        struct list_head list;
 };
 
 /* patch-specific record */
 struct hda_gspec {
-    struct hda_gnode *dac_node; /* DAC node */
-    struct hda_gnode *out_pin_node;     /* Output pin (Line-Out) node */
-    struct hda_gnode *pcm_vol_node;     /* Node for PCM volume */
-    unsigned int pcm_vol_index; /* connection of PCM volume */
-
-    struct hda_gnode *adc_node; /* ADC node */
-    struct hda_gnode *cap_vol_node;     /* Node for capture volume */
-    unsigned int cur_cap_src;   /* current capture source */
-    struct hda_input_mux input_mux;
-    char cap_labels[HDA_MAX_NUM_INPUTS][16];
-
-    unsigned int def_amp_in_caps;
-    unsigned int def_amp_out_caps;
-
-    struct hda_pcm pcm_rec;             /* PCM information */
-
-    struct list_head nid_list;  /* list of widgets */
+        struct hda_gnode *dac_node;     /* DAC node */
+        struct hda_gnode *out_pin_node; /* Output pin (Line-Out) node */
+        struct hda_gnode *pcm_vol_node; /* Node for PCM volume */
+        unsigned int pcm_vol_index;     /* connection of PCM volume */
+
+        struct hda_gnode *adc_node;     /* ADC node */
+        struct hda_gnode *cap_vol_node; /* Node for capture volume */
+        unsigned int cur_cap_src;       /* current capture source */
+        struct hda_input_mux input_mux;
+        char cap_labels[HDA_MAX_NUM_INPUTS][16];
+
+        unsigned int def_amp_in_caps;
+        unsigned int def_amp_out_caps;
+
+        struct hda_pcm pcm_rec;         /* PCM information */
+
+        struct list_head nid_list;      /* list of widgets */
 };
 
@@ -69 +70 @@
  * retrieve the default device type from the default config value
  */
-#define get_defcfg_type(node) (((node)->def_cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
-#define get_defcfg_location(node) (((node)->def_cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT)
+#define defcfg_type(node) (((node)->def_cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
+#define defcfg_location(node) (((node)->def_cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT)
 
 /*
@@ -77 +78 @@
 static void snd_hda_generic_free(struct hda_codec *codec)
 {
-    struct hda_gspec *spec = codec->spec;
-    struct list_head *p, *n;
-
-    if (! spec)
-        return;
-    /* free all widgets */
-    list_for_each_safe(p, n, &spec->nid_list) {
-        struct hda_gnode *node = list_entry(p, struct hda_gnode, list);
-        kfree(node);
-    }
-    kfree(spec);
+        struct hda_gspec *spec = codec->spec;
+        struct list_head *p, *n;
+
+        if (! spec)
+                return;
+        /* free all widgets */
+        list_for_each_safe(p, n, &spec->nid_list) {
+                struct hda_gnode *node = list_entry(p, struct hda_gnode, list);
+                if (node->conn_list != node->slist)
+                        kfree(node->conn_list);
+                kfree(node);
+        }
+        kfree(spec);
 }
 
@@ -96 +99 @@
 static int add_new_node(struct hda_codec *codec, struct hda_gspec *spec, hda_nid_t nid)
 {
-    struct hda_gnode *node;
-    int nconns;
-
-    node = kcalloc(1, sizeof(*node), GFP_KERNEL);
-    if (node == NULL)
-        return -ENOMEM;
-    node->nid = nid;
-    nconns = snd_hda_get_connections(codec, nid, node->conn_list, HDA_MAX_CONNECTIONS);
-    if (nconns < 0) {
-        kfree(node);
-        return nconns;
-    }
-    node->nconns = nconns;
-    node->wid_caps = snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP);
-    node->type = (node->wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
-
-    if (node->type == AC_WID_PIN) {
-        node->pin_caps = snd_hda_param_read(codec, node->nid, AC_PAR_PIN_CAP);
-        node->pin_ctl = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-        node->def_cfg = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
-    }
-
-    if (node->wid_caps & AC_WCAP_OUT_AMP) {
-        if (node->wid_caps & AC_WCAP_AMP_OVRD)
-            node->amp_out_caps = snd_hda_param_read(codec, node->nid, AC_PAR_AMP_OUT_CAP);
-        if (! node->amp_out_caps)
-            node->amp_out_caps = spec->def_amp_out_caps;
-    }
-    if (node->wid_caps & AC_WCAP_IN_AMP) {
-        if (node->wid_caps & AC_WCAP_AMP_OVRD)
-            node->amp_in_caps = snd_hda_param_read(codec, node->nid, AC_PAR_AMP_IN_CAP);
-        if (! node->amp_in_caps)
-            node->amp_in_caps = spec->def_amp_in_caps;
-    }
-    list_add_tail(&node->list, &spec->nid_list);
-    return 0;
+        struct hda_gnode *node;
+        int nconns;
+        hda_nid_t conn_list[HDA_MAX_CONNECTIONS];
+
+        node = kzalloc(sizeof(*node), GFP_KERNEL);
+        if (node == NULL)
+                return -ENOMEM;
+        node->nid = nid;
+        nconns = snd_hda_get_connections(codec, nid, conn_list,
+                                         HDA_MAX_CONNECTIONS);
+        if (nconns < 0) {
+                kfree(node);
+                return nconns;
+        }
+        if (nconns <= ARRAY_SIZE(node->slist))
+                node->conn_list = node->slist;
+        else {
+                node->conn_list = kmalloc(sizeof(hda_nid_t) * nconns,
+                                          GFP_KERNEL);
+                if (! node->conn_list) {
+                        snd_printk(KERN_ERR "hda-generic: cannot malloc\n");
+                        kfree(node);
+                        return -ENOMEM;
+                }
+        }
+        memcpy(node->conn_list, conn_list, nconns);
+        node->nconns = nconns;
+        node->wid_caps = get_wcaps(codec, nid);
+        node->type = (node->wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+
+        if (node->type == AC_WID_PIN) {
+                node->pin_caps = snd_hda_param_read(codec, node->nid, AC_PAR_PIN_CAP);
+                node->pin_ctl = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                node->def_cfg = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+        }
+
+        if (node->wid_caps & AC_WCAP_OUT_AMP) {
+                if (node->wid_caps & AC_WCAP_AMP_OVRD)
+                        node->amp_out_caps = snd_hda_param_read(codec, node->nid, AC_PAR_AMP_OUT_CAP);
+                if (! node->amp_out_caps)
+                        node->amp_out_caps = spec->def_amp_out_caps;
+        }
+        if (node->wid_caps & AC_WCAP_IN_AMP) {
+                if (node->wid_caps & AC_WCAP_AMP_OVRD)
+                        node->amp_in_caps = snd_hda_param_read(codec, node->nid, AC_PAR_AMP_IN_CAP);
+                if (! node->amp_in_caps)
+                        node->amp_in_caps = spec->def_amp_in_caps;
+        }
+        list_add_tail(&node->list, &spec->nid_list);
+        return 0;
 }
 
@@ -139 +156 @@
 static int build_afg_tree(struct hda_codec *codec)
 {
-    struct hda_gspec *spec = codec->spec;
-    int i, nodes, err;
-    hda_nid_t nid;
-
-    snd_assert(spec, return -EINVAL);
-
-    spec->def_amp_out_caps = snd_hda_param_read(codec, codec->afg, AC_PAR_AMP_OUT_CAP);
-    spec->def_amp_in_caps = snd_hda_param_read(codec, codec->afg, AC_PAR_AMP_IN_CAP);
-
-    nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid);
-    if (! nid || nodes < 0) {
-        printk(KERN_ERR "Invalid AFG subtree\n");
-        return -EINVAL;
-    }
-
-    /* parse all nodes belonging to the AFG */
-    for (i = 0; i < nodes; i++, nid++) {
-        if ((err = add_new_node(codec, spec, nid)) < 0)
-            return err;
-    }
-
-    return 0;
+        struct hda_gspec *spec = codec->spec;
+        int i, nodes, err;
+        hda_nid_t nid;
+
+        snd_assert(spec, return -EINVAL);
+
+        spec->def_amp_out_caps = snd_hda_param_read(codec, codec->afg, AC_PAR_AMP_OUT_CAP);
+        spec->def_amp_in_caps = snd_hda_param_read(codec, codec->afg, AC_PAR_AMP_IN_CAP);
+
+        nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid);
+        if (! nid || nodes < 0) {
+                printk(KERN_ERR "Invalid AFG subtree\n");
+                return -EINVAL;
+        }
+
+        /* parse all nodes belonging to the AFG */
+        for (i = 0; i < nodes; i++, nid++) {
+                if ((err = add_new_node(codec, spec, nid)) < 0)
+                        return err;
+        }
+
+        return 0;
 }
 
@@ -170 +187 @@
 static struct hda_gnode *hda_get_node(struct hda_gspec *spec, hda_nid_t nid)
 {
-    struct list_head *p;
-    struct hda_gnode *node;
-
-    list_for_each(p, &spec->nid_list) {
-        node = list_entry(p, struct hda_gnode, list);
-        if (node->nid == nid)
-            return node;
-    }
-    return NULL;
+        struct list_head *p;
+        struct hda_gnode *node;
+
+        list_for_each(p, &spec->nid_list) {
+                node = list_entry(p, struct hda_gnode, list);
+                if (node->nid == nid)
+                        return node;
+        }
+        return NULL;
 }
 
@@ -186 +203 @@
 static int unmute_output(struct hda_codec *codec, struct hda_gnode *node)
 {
-    unsigned int val, ofs;
-    snd_printdd("UNMUTE OUT: NID=0x%x\n", node->nid);
-    val = (node->amp_out_caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT;
-    ofs = (node->amp_out_caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT;
-    if (val >= ofs)
-        val -= ofs;
-    val |= AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT;
-    val |= AC_AMP_SET_OUTPUT;
-    return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, val);
+        unsigned int val, ofs;
+        snd_printdd("UNMUTE OUT: NID=0x%x\n", node->nid);
+        val = (node->amp_out_caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT;
+        ofs = (node->amp_out_caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT;
+        if (val >= ofs)
+                val -= ofs;
+        val |= AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT;
+        val |= AC_AMP_SET_OUTPUT;
+        return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, val);
 }
 
@@ -202 +219 @@
 static int unmute_input(struct hda_codec *codec, struct hda_gnode *node, unsigned int index)
 {
-    unsigned int val, ofs;
-    snd_printdd("UNMUTE IN: NID=0x%x IDX=0x%x\n", node->nid, index);
-    val = (node->amp_in_caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT;
-    ofs = (node->amp_in_caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT;
-    if (val >= ofs)
-        val -= ofs;
-    val |= AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT;
-    val |= AC_AMP_SET_INPUT;
-    // awk added - fixed to allow unmuting of indexed amps
-    val |= index << AC_AMP_SET_INDEX_SHIFT;
-    return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, val);
+        unsigned int val, ofs;
+        snd_printdd("UNMUTE IN: NID=0x%x IDX=0x%x\n", node->nid, index);
+        val = (node->amp_in_caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT;
+        ofs = (node->amp_in_caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT;
+        if (val >= ofs)
+                val -= ofs;
+        val |= AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT;
+        val |= AC_AMP_SET_INPUT;
+        // awk added - fixed to allow unmuting of indexed amps
+        val |= index << AC_AMP_SET_INDEX_SHIFT;
+        return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, val);
 }
 
@@ -219 +236 @@
  */
 static int select_input_connection(struct hda_codec *codec, struct hda_gnode *node,
-                                   unsigned int index)
-{
-    snd_printdd("CONNECT: NID=0x%x IDX=0x%x\n", node->nid, index);
-    return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_CONNECT_SEL, index);
+                                   unsigned int index)
+{
+        snd_printdd("CONNECT: NID=0x%x IDX=0x%x\n", node->nid, index);
+        return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_CONNECT_SEL, index);
 }
 
@@ -230 +247 @@
 static void clear_check_flags(struct hda_gspec *spec)
 {
-    struct list_head *p;
-    struct hda_gnode *node;
-
-    list_for_each(p, &spec->nid_list) {
-        node = list_entry(p, struct hda_gnode, list);
-        node->checked = 0;
-    }
+        struct list_head *p;
+        struct hda_gnode *node;
+
+        list_for_each(p, &spec->nid_list) {
+                node = list_entry(p, struct hda_gnode, list);
+                node->checked = 0;
+        }
 }
 
@@ -245 +262 @@
  */
 static int parse_output_path(struct hda_codec *codec, struct hda_gspec *spec,
-                             struct hda_gnode *node)
-{
-    int i, err;
-    struct hda_gnode *child;
-
-    if (node->checked)
-        return 0;
-
-    node->checked = 1;
-    if (node->type == AC_WID_AUD_OUT) {
-        if (node->wid_caps & AC_WCAP_DIGITAL) {
-            snd_printdd("Skip Digital OUT node %x\n", node->nid);
-            return 0;
-        }
-        snd_printdd("AUD_OUT found %x\n", node->nid);
-        if (spec->dac_node) {
-            /* already DAC node is assigned, just unmute & connect */
-            return node == spec->dac_node;
-        }
-        spec->dac_node = node;
-        if (node->wid_caps & AC_WCAP_OUT_AMP) {
-            spec->pcm_vol_node = node;
-            spec->pcm_vol_index = 0;
-        }
-        return 1; /* found */
-    }
-
-    for (i = 0; i < node->nconns; i++) {
-        child = hda_get_node(spec, node->conn_list[i]);
-        if (! child)
-            continue;
-        err = parse_output_path(codec, spec, child);
-        if (err < 0)
-            return err;
-        else if (err > 0) {
-            /* found one,
-             * select the path, unmute both input and output
-             */
-            if (node->nconns > 1)
-                select_input_connection(codec, node, i);
-            unmute_input(codec, node, i);
-            unmute_output(codec, node);
-            if (! spec->pcm_vol_node) {
-                if (node->wid_caps & AC_WCAP_IN_AMP) {
-                    spec->pcm_vol_node = node;
-                    spec->pcm_vol_index = i;
-                } else if (node->wid_caps & AC_WCAP_OUT_AMP) {
-                    spec->pcm_vol_node = node;
-                    spec->pcm_vol_index = 0;
-                }
-            }
-            return 1;
-        }
-    }
-    return 0;
+                             struct hda_gnode *node)
+{
+        int i, err;
+        struct hda_gnode *child;
+
+        if (node->checked)
+                return 0;
+
+        node->checked = 1;
+        if (node->type == AC_WID_AUD_OUT) {
+                if (node->wid_caps & AC_WCAP_DIGITAL) {
+                        snd_printdd("Skip Digital OUT node %x\n", node->nid);
+                        return 0;
+                }
+                snd_printdd("AUD_OUT found %x\n", node->nid);
+                if (spec->dac_node) {
+                        /* already DAC node is assigned, just unmute & connect */
+                        return node == spec->dac_node;
+                }
+                spec->dac_node = node;
+                if (node->wid_caps & AC_WCAP_OUT_AMP) {
+                        spec->pcm_vol_node = node;
+                        spec->pcm_vol_index = 0;
+                }
+                return 1; /* found */
+        }
+
+        for (i = 0; i < node->nconns; i++) {
+                child = hda_get_node(spec, node->conn_list[i]);
+                if (! child)
+                        continue;
+                err = parse_output_path(codec, spec, child);
+                if (err < 0)
+                        return err;
+                else if (err > 0) {
+                        /* found one,
+                         * select the path, unmute both input and output
+                         */
+                        if (node->nconns > 1)
+                                select_input_connection(codec, node, i);
+                        unmute_input(codec, node, i);
+                        unmute_output(codec, node);
+                        if (! spec->pcm_vol_node) {
+                                if (node->wid_caps & AC_WCAP_IN_AMP) {
+                                        spec->pcm_vol_node = node;
+                                        spec->pcm_vol_index = i;
+                                } else if (node->wid_caps & AC_WCAP_OUT_AMP) {
+                                        spec->pcm_vol_node = node;
+                                        spec->pcm_vol_index = 0;
+                                }
+                        }
+                        return 1;
+                }
+        }
+        return 0;
 }
 
@@ -309 +326 @@
  */
 static struct hda_gnode *parse_output_jack(struct hda_codec *codec,
-                                           struct hda_gspec *spec,
-                                           int jack_type)
-{
-    struct list_head *p;
-    struct hda_gnode *node;
-    int err;
-
-    list_for_each(p, &spec->nid_list) {
-        node = list_entry(p, struct hda_gnode, list);
-        if (node->type != AC_WID_PIN)
-            continue;
-        /* output capable? */
-        if (! (node->pin_caps & AC_PINCAP_OUT))
-            continue;
-        if (jack_type >= 0) {
-            if (jack_type != get_defcfg_type(node))
-                continue;
-            if (node->wid_caps & AC_WCAP_DIGITAL)
-                continue; /* skip SPDIF */
-        } else {
-            /* output as default? */
-            if (! (node->pin_ctl & AC_PINCTL_OUT_EN))
-                continue;
-        }
-        clear_check_flags(spec);
-        err = parse_output_path(codec, spec, node);
-        if (err < 0)
-            return NULL;
-        else if (err > 0) {
-            /* unmute the PIN output */
-            unmute_output(codec, node);
-            /* set PIN-Out enable */
-            snd_hda_codec_write(codec, node->nid, 0,
-                                AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN);
-            return node;
-        }
-    }
-    return NULL;
+                                           struct hda_gspec *spec,
+                                           int jack_type)
+{
+        struct list_head *p;
+        struct hda_gnode *node;
+        int err;
+
+        list_for_each(p, &spec->nid_list) {
+                node = list_entry(p, struct hda_gnode, list);
+                if (node->type != AC_WID_PIN)
+                        continue;
+                /* output capable? */
+                if (! (node->pin_caps & AC_PINCAP_OUT))
+                        continue;
+                if (jack_type >= 0) {
+                        if (jack_type != defcfg_type(node))
+                                continue;
+                        if (node->wid_caps & AC_WCAP_DIGITAL)
+                                continue; /* skip SPDIF */
+                } else {
+                        /* output as default? */
+                        if (! (node->pin_ctl & AC_PINCTL_OUT_EN))
+                                continue;
+                }
+                clear_check_flags(spec);
+                err = parse_output_path(codec, spec, node);
+                if (err < 0)
+                        return NULL;
+                else if (err > 0) {
+                        /* unmute the PIN output */
+                        unmute_output(codec, node);
+                        /* set PIN-Out enable */
+                        snd_hda_codec_write(codec, node->nid, 0,
+                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                            AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN);
+                        return node;
+                }
+        }
+        return NULL;
 }
 
@@ -356 +373 @@
 static int parse_output(struct hda_codec *codec)
 {
-    struct hda_gspec *spec = codec->spec;
-    struct hda_gnode *node;
-
-    /*
-     * Look for the output PIN widget
-     */
-    /* first, look for the line-out pin */
-    node = parse_output_jack(codec, spec, AC_JACK_LINE_OUT);
-    if (node) /* found, remember the PIN node */
-        spec->out_pin_node = node;
-    /* look for the HP-out pin */
-    node = parse_output_jack(codec, spec, AC_JACK_HP_OUT);
-    if (node) {
-        if (! spec->out_pin_node)
-            spec->out_pin_node = node;
-    }
-
-    if (! spec->out_pin_node) {
-        /* no line-out or HP pins found,
-         * then choose for the first output pin
-         */
-        spec->out_pin_node = parse_output_jack(codec, spec, -1);
-        if (! spec->out_pin_node)
-            snd_printd("hda_generic: no proper output path found\n");
-    }
-
-    return 0;
+        struct hda_gspec *spec = codec->spec;
+        struct hda_gnode *node;
+
+        /*
+         * Look for the output PIN widget
+         */
+        /* first, look for the line-out pin */
+        node = parse_output_jack(codec, spec, AC_JACK_LINE_OUT);
+        if (node) /* found, remember the PIN node */
+                spec->out_pin_node = node;
+        /* look for the HP-out pin */
+        node = parse_output_jack(codec, spec, AC_JACK_HP_OUT);
+        if (node) {
+                if (! spec->out_pin_node)
+                        spec->out_pin_node = node;
+        }
+
+        if (! spec->out_pin_node) {
+                /* no line-out or HP pins found,
+                 * then choose for the first output pin
+                 */
+                spec->out_pin_node = parse_output_jack(codec, spec, -1);
+                if (! spec->out_pin_node)
+                        snd_printd("hda_generic: no proper output path found\n");
+        }
+
+        return 0;
 }
 
@@ -390 +407 @@
 
 /* control callbacks */
-static int capture_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct hda_gspec *spec = codec->spec;
-    return snd_hda_input_mux_info(&spec->input_mux, uinfo);
-}
-
-static int capture_source_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct hda_gspec *spec = codec->spec;
-
-    ucontrol->value.enumerated.item[0] = spec->cur_cap_src;
-    return 0;
-}
-
-static int capture_source_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct hda_gspec *spec = codec->spec;
-    return snd_hda_input_mux_put(codec, &spec->input_mux, ucontrol,
-                                 spec->adc_node->nid, &spec->cur_cap_src);
+static int capture_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct hda_gspec *spec = codec->spec;
+        return snd_hda_input_mux_info(&spec->input_mux, uinfo);
+}
+
+static int capture_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct hda_gspec *spec = codec->spec;
+
+        ucontrol->value.enumerated.item[0] = spec->cur_cap_src;
+        return 0;
+}
+
+static int capture_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct hda_gspec *spec = codec->spec;
+        return snd_hda_input_mux_put(codec, &spec->input_mux, ucontrol,
+                                     spec->adc_node->nid, &spec->cur_cap_src);
 }
 
@@ -419 +436 @@
 static const char *get_input_type(struct hda_gnode *node, unsigned int *pinctl)
 {
-    unsigned int location = get_defcfg_location(node);
-    switch (get_defcfg_type(node)) {
-    case AC_JACK_LINE_IN:
-        if ((location & 0x0f) == AC_JACK_LOC_FRONT)
-            return "Front Line";
-        return "Line";
-    case AC_JACK_CD:
-        if (pinctl)
-            *pinctl |= AC_PINCTL_VREF_GRD;
-        return "CD";
-    case AC_JACK_AUX:
-        if ((location & 0x0f) == AC_JACK_LOC_FRONT)
-            return "Front Aux";
-        return "Aux";
-    case AC_JACK_MIC_IN:
-        if ((location & 0x0f) == AC_JACK_LOC_FRONT)
-            return "Front Mic";
-        return "Mic";
-    case AC_JACK_SPDIF_IN:
-        return "SPDIF";
-    case AC_JACK_DIG_OTHER_IN:
-        return "Digital";
-    }
-    return NULL;
+        unsigned int location = defcfg_location(node);
+        switch (defcfg_type(node)) {
+        case AC_JACK_LINE_IN:
+                if ((location & 0x0f) == AC_JACK_LOC_FRONT)
+                        return "Front Line";
+                return "Line";
+        case AC_JACK_CD:
+                if (pinctl)
+                        *pinctl |= AC_PINCTL_VREF_GRD;
+                return "CD";
+        case AC_JACK_AUX:
+                if ((location & 0x0f) == AC_JACK_LOC_FRONT)
+                        return "Front Aux";
+                return "Aux";
+        case AC_JACK_MIC_IN:
+                if ((location & 0x0f) == AC_JACK_LOC_FRONT)
+                        return "Front Mic";
+                return "Mic";
+        case AC_JACK_SPDIF_IN:
+                return "SPDIF";
+        case AC_JACK_DIG_OTHER_IN:
+                return "Digital";
+        }
+        return NULL;
 }
 
@@ -451 +468 @@
  */
 static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
-                               struct hda_gnode *node)
-{
-    int i, err;
-    unsigned int pinctl;
-    char *label;
-    const char *type;
-
-    if (node->checked)
-        return 0;
-
-    node->checked = 1;
-    if (node->type != AC_WID_PIN) {
-        for (i = 0; i < node->nconns; i++) {
-            struct hda_gnode *child;
-            child = hda_get_node(spec, node->conn_list[i]);
-            if (! child)
-                continue;
-            err = parse_adc_sub_nodes(codec, spec, child);
-            if (err < 0)
-                return err;
-            if (err > 0) {
-                /* found one,
-                 * select the path, unmute both input and output
-                 */
-                if (node->nconns > 1)
-                    select_input_connection(codec, node, i);
-                unmute_input(codec, node, i);
-                unmute_output(codec, node);
-                return err;
-            }
-        }
-        return 0;
-    }
-
-    /* input capable? */
-    if (! (node->pin_caps & AC_PINCAP_IN))
-        return 0;
-
-    if (node->wid_caps & AC_WCAP_DIGITAL)
-        return 0; /* skip SPDIF */
-
-    if (spec->input_mux.num_items >= HDA_MAX_NUM_INPUTS) {
-        snd_printk(KERN_ERR "hda_generic: Too many items for capture\n");
-        return -EINVAL;
-    }
-
-    pinctl = AC_PINCTL_IN_EN;
-    /* create a proper capture source label */
-    type = get_input_type(node, &pinctl);
-    if (! type) {
-        /* input as default? */
-        if (! (node->pin_ctl & AC_PINCTL_IN_EN))
-            return 0;
-        type = "Input";
-    }
-    label = spec->cap_labels[spec->input_mux.num_items];
-    strcpy(label, type);
-    spec->input_mux.items[spec->input_mux.num_items].label = label;
-
-    /* unmute the PIN external input */
-    unmute_input(codec, node, 0); /* index = 0? */
-    /* set PIN-In enable */
-    snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);
-
-    return 1; /* found */
+                               struct hda_gnode *node)
+{
+        int i, err;
+        unsigned int pinctl;
+        char *label;
+        const char *type;
+
+        if (node->checked)
+                return 0;
+
+        node->checked = 1;
+        if (node->type != AC_WID_PIN) {
+                for (i = 0; i < node->nconns; i++) {
+                        struct hda_gnode *child;
+                        child = hda_get_node(spec, node->conn_list[i]);
+                        if (! child)
+                                continue;
+                        err = parse_adc_sub_nodes(codec, spec, child);
+                        if (err < 0)
+                                return err;
+                        if (err > 0) {
+                                /* found one,
+                                 * select the path, unmute both input and output
+                                 */
+                                if (node->nconns > 1)
+                                        select_input_connection(codec, node, i);
+                                unmute_input(codec, node, i);
+                                unmute_output(codec, node);
+                                return err;
+                        }
+                }
+                return 0;
+        }
+
+        /* input capable? */
+        if (! (node->pin_caps & AC_PINCAP_IN))
+                return 0;
+
+        if (node->wid_caps & AC_WCAP_DIGITAL)
+                return 0; /* skip SPDIF */
+
+        if (spec->input_mux.num_items >= HDA_MAX_NUM_INPUTS) {
+                snd_printk(KERN_ERR "hda_generic: Too many items for capture\n");
+                return -EINVAL;
+        }
+
+        pinctl = AC_PINCTL_IN_EN;
+        /* create a proper capture source label */
+        type = get_input_type(node, &pinctl);
+        if (! type) {
+                /* input as default? */
+                if (! (node->pin_ctl & AC_PINCTL_IN_EN))
+                        return 0;
+                type = "Input";
+        }
+        label = spec->cap_labels[spec->input_mux.num_items];
+        strcpy(label, type);
+        spec->input_mux.items[spec->input_mux.num_items].label = label;
+
+        /* unmute the PIN external input */
+        unmute_input(codec, node, 0); /* index = 0? */
+        /* set PIN-In enable */
+        snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);
+
+        return 1; /* found */
 }
 
@@ -523 +540 @@
 static int parse_input_path(struct hda_codec *codec, struct hda_gnode *adc_node)
 {
-    struct hda_gspec *spec = codec->spec;
-    struct hda_gnode *node;
-    int i, err;
-
-    snd_printdd("AUD_IN = %x\n", adc_node->nid);
-    clear_check_flags(spec);
-
-    // awk added - fixed no recording due to muted widget
-    unmute_input(codec, adc_node, 0);
-
-    /*
-     * check each connection of the ADC
-     * if it reaches to a proper input PIN, add the path as the
-     * input path.
-     */
-    for (i = 0; i < adc_node->nconns; i++) {
-        node = hda_get_node(spec, adc_node->conn_list[i]);
-        if (! node)
-            continue;
-        err = parse_adc_sub_nodes(codec, spec, node);
-        if (err < 0)
-            return err;
-        else if (err > 0) {
-            struct hda_input_mux_item *csrc = &spec->input_mux.items[spec->input_mux.num_items];
-            char *buf = spec->cap_labels[spec->input_mux.num_items];
-            int ocap;
-            for (ocap = 0; ocap < spec->input_mux.num_items; ocap++) {
-                if (! strcmp(buf, spec->cap_labels[ocap])) {
-                    /* same label already exists,
-                     * put the index number to be unique
-                     */
-                    sprintf(buf, "%s %d", spec->cap_labels[ocap],
-                            spec->input_mux.num_items);
-                }
-            }
-            csrc->index = i;
-            spec->input_mux.num_items++;
-        }
-    }
-
-    if (! spec->input_mux.num_items)
-        return 0; /* no input path found... */
-
-    snd_printdd("[Capture Source] NID=0x%x, #SRC=%d\n", adc_node->nid, spec->input_mux.num_items);
-    for (i = 0; i < spec->input_mux.num_items; i++)
-        snd_printdd("  [%s] IDX=0x%x\n", spec->input_mux.items[i].label,
-                    spec->input_mux.items[i].index);
-
-    spec->adc_node = adc_node;
-    return 1;
+        struct hda_gspec *spec = codec->spec;
+        struct hda_gnode *node;
+        int i, err;
+
+        snd_printdd("AUD_IN = %x\n", adc_node->nid);
+        clear_check_flags(spec);
+
+        // awk added - fixed no recording due to muted widget
+        unmute_input(codec, adc_node, 0);
+        
+        /*
+         * check each connection of the ADC
+         * if it reaches to a proper input PIN, add the path as the
+         * input path.
+         */
+        for (i = 0; i < adc_node->nconns; i++) {
+                node = hda_get_node(spec, adc_node->conn_list[i]);
+                if (! node)
+                        continue;
+                err = parse_adc_sub_nodes(codec, spec, node);
+                if (err < 0)
+                        return err;
+                else if (err > 0) {
+                        struct hda_input_mux_item *csrc = &spec->input_mux.items[spec->input_mux.num_items];
+                        char *buf = spec->cap_labels[spec->input_mux.num_items];
+                        int ocap;
+                        for (ocap = 0; ocap < spec->input_mux.num_items; ocap++) {
+                                if (! strcmp(buf, spec->cap_labels[ocap])) {
+                                        /* same label already exists,
+                                         * put the index number to be unique
+                                         */
+                                        sprintf(buf, "%s %d", spec->cap_labels[ocap],
+                                                spec->input_mux.num_items);
+                                }
+                        }
+                        csrc->index = i;
+                        spec->input_mux.num_items++;
+                }
+        }
+
+        if (! spec->input_mux.num_items)
+                return 0; /* no input path found... */
+
+        snd_printdd("[Capture Source] NID=0x%x, #SRC=%d\n", adc_node->nid, spec->input_mux.num_items);
+        for (i = 0; i < spec->input_mux.num_items; i++)
+                snd_printdd("  [%s] IDX=0x%x\n", spec->input_mux.items[i].label,
+                            spec->input_mux.items[i].index);
+
+        spec->adc_node = adc_node;
+        return 1;
 }
 
@@ -580 +597 @@
 static int parse_input(struct hda_codec *codec)
 {
-    struct hda_gspec *spec = codec->spec;
-    struct list_head *p;
-    struct hda_gnode *node;
-    int err;
-
-    /*
-     * At first we look for an audio input widget.
-     * If it reaches to certain input PINs, we take it as the
-     * input path.
-     */
-    list_for_each(p, &spec->nid_list) {
-        node = list_entry(p, struct hda_gnode, list);
-        if (node->wid_caps & AC_WCAP_DIGITAL)
-            continue; /* skip SPDIF */
-        if (node->type == AC_WID_AUD_IN) {
-            err = parse_input_path(codec, node);
-            if (err < 0)
-                return err;
-            else if (err > 0)
-                return 0;
-        }
-    }
-    snd_printd("hda_generic: no proper input path found\n");
-    return 0;
+        struct hda_gspec *spec = codec->spec;
+        struct list_head *p;
+        struct hda_gnode *node;
+        int err;
+
+        /*
+         * At first we look for an audio input widget.
+         * If it reaches to certain input PINs, we take it as the
+         * input path.
+         */
+        list_for_each(p, &spec->nid_list) {
+                node = list_entry(p, struct hda_gnode, list);
+                if (node->wid_caps & AC_WCAP_DIGITAL)
+                        continue; /* skip SPDIF */
+                if (node->type == AC_WID_AUD_IN) {
+                        err = parse_input_path(codec, node);
+                        if (err < 0)
+                                return err;
+                        else if (err > 0)
+                                return 0;
+                }
+        }
+        snd_printd("hda_generic: no proper input path found\n");
+        return 0;
 }
 
@@ -613 +630 @@
 
 static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
-                        unsigned int index, const char *type, const char *dir_sfx)
-{
-    char name[32] = {0};
-    int err;
-    int created = 0;
-    snd_kcontrol_new_t knew;
-
-    if (type)
-        sprintf(name, "%s %s Switch", type, dir_sfx);
-    else
-        sprintf(name, "%s Switch", dir_sfx);
-    if ((node->wid_caps & AC_WCAP_IN_AMP) &&
-        (node->amp_in_caps & AC_AMPCAP_MUTE)) {
-        //knew = {0};
-        //HDA_CODEC_MUTE(name, node->nid, index, HDA_INPUT);
-
-        knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        knew.name = name;
-        knew.info = snd_hda_mixer_amp_switch_info;
-        knew.get = snd_hda_mixer_amp_switch_get;
-        knew.put = snd_hda_mixer_amp_switch_put;
-        knew.private_value = (node->nid | (3 << 16) | (HDA_INPUT << 18) | (index << 19));
-        snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index);
-        if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)
-            return err;
-        created = 1;
-    } else if ((node->wid_caps & AC_WCAP_OUT_AMP) &&
-               (node->amp_out_caps & AC_AMPCAP_MUTE)) {
-        //knew = {0};
+                        unsigned int index, const char *type, const char *dir_sfx)
+{
+        char name[32];
+        int err;
+        int created = 0;
+        struct snd_kcontrol_new knew = {0};
+
+        if (type)
+                sprintf(name, "%s %s Switch", type, dir_sfx);
+        else
+                sprintf(name, "%s Switch", dir_sfx);
+        if ((node->wid_caps & AC_WCAP_IN_AMP) &&
+            (node->amp_in_caps & AC_AMPCAP_MUTE)) {
+            knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+            knew.name = name;
+            knew.info = snd_hda_mixer_amp_switch_info;
+            knew.get = snd_hda_mixer_amp_switch_get;
+            knew.put = snd_hda_mixer_amp_switch_put;
+            knew.private_value = (node->nid | (3 << 16) | (HDA_INPUT << 18) | (index << 19));
+
+            //knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node->nid, index, HDA_INPUT);
+                snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index);
+                if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)
+                        return err;
+                created = 1;
+        } else if ((node->wid_caps & AC_WCAP_OUT_AMP) &&
+                   (node->amp_out_caps & AC_AMPCAP_MUTE)) {
         knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
         knew.name = name;
@@ -649 +664 @@
         knew.private_value = (node->nid | (3 << 16) | (HDA_OUTPUT << 18) | (0 << 19));
 
-        //HDA_CODEC_MUTE(name, node->nid, 0, HDA_OUTPUT);
-        snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);
-        if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)
-            return err;
-        created = 1;
-    }
-
-    if (type)
-        sprintf(name, "%s %s Volume", type, dir_sfx);
-    else
-        sprintf(name, "%s Volume", dir_sfx);
-    if ((node->wid_caps & AC_WCAP_IN_AMP) &&
-        (node->amp_in_caps & AC_AMPCAP_NUM_STEPS)) {
-        //knew = {0};
+                //knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node->nid, 0, HDA_OUTPUT);
+                snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);
+                if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)
+                        return err;
+                created = 1;
+        }
+
+        if (type)
+                sprintf(name, "%s %s Volume", type, dir_sfx);
+        else
+                sprintf(name, "%s Volume", dir_sfx);
+        if ((node->wid_caps & AC_WCAP_IN_AMP) &&
+            (node->amp_in_caps & AC_AMPCAP_NUM_STEPS)) {
         knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
         knew.name = name;
@@ -669 +683 @@
         knew.put = snd_hda_mixer_amp_volume_put;
         knew.private_value = (node->nid | (3 << 16) | (HDA_INPUT << 18) | (index << 19));
-        //HDA_CODEC_VOLUME(name, node->nid, index, HDA_INPUT);
-        snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index);
-        if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)
-            return err;
-        created = 1;
-    } else if ((node->wid_caps & AC_WCAP_OUT_AMP) &&
-               (node->amp_out_caps & AC_AMPCAP_NUM_STEPS)) {
-        //knew = {0};
+
+                //knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node->nid, index, HDA_INPUT);
+                snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index);
+                if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)
+                        return err;
+                created = 1;
+        } else if ((node->wid_caps & AC_WCAP_OUT_AMP) &&
+                   (node->amp_out_caps & AC_AMPCAP_NUM_STEPS)) {
+            //knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node->nid, 0, HDA_OUTPUT);
         knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
         knew.name = name;
@@ -683 +698 @@
         knew.put = snd_hda_mixer_amp_volume_put;
         knew.private_value = (node->nid | (3 << 16) | (HDA_OUTPUT << 18) | (0 << 19));
-        //HDA_CODEC_VOLUME(name, node->nid, 0, HDA_OUTPUT);
-        snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);
-        if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)
-            return err;
-        created = 1;
-    }
-
-    return created;
+
+                snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);
+                if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)
+                        return err;
+                created = 1;
+        }
+
+        return created;
 }
 
@@ -698 +713 @@
 static int check_existing_control(struct hda_codec *codec, const char *type, const char *dir)
 {
-    snd_ctl_elem_id_t id;
-    memset(&id, 0, sizeof(id));
-    sprintf(id.name, "%s %s Volume", type, dir);
-    id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-    if (snd_ctl_find_id(codec->bus->card, &id))
-        return 1;
-    sprintf(id.name, "%s %s Switch", type, dir);
-    id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-    if (snd_ctl_find_id(codec->bus->card, &id))
-        return 1;
-    return 0;
+        struct snd_ctl_elem_id id;
+        memset(&id, 0, sizeof(id));
+        sprintf(id.name, "%s %s Volume", type, dir);
+        id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        if (snd_ctl_find_id(codec->bus->card, &id))
+                return 1;
+        sprintf(id.name, "%s %s Switch", type, dir);
+        id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        if (snd_ctl_find_id(codec->bus->card, &id))
+                return 1;
+        return 0;
 }
 
@@ -716 +731 @@
 static int build_output_controls(struct hda_codec *codec)
 {
-    struct hda_gspec *spec = codec->spec;
-    int err;
-
-    err = create_mixer(codec, spec->pcm_vol_node, spec->pcm_vol_index,
-                       "PCM", "Playback");
-    if (err < 0)
-        return err;
-    return 0;
+        struct hda_gspec *spec = codec->spec;
+        int err;
+
+        err = create_mixer(codec, spec->pcm_vol_node, spec->pcm_vol_index,
+                           "PCM", "Playback");
+        if (err < 0)
+                return err;
+        return 0;
 }
 
@@ -729 +744 @@
 static int build_input_controls(struct hda_codec *codec)
 {
-    struct hda_gspec *spec = codec->spec;
-    struct hda_gnode *adc_node = spec->adc_node;
-    int err;
-
-    if (! adc_node)
-        return 0; /* not found */
-
-    /* create capture volume and switch controls if the ADC has an amp */
-    err = create_mixer(codec, adc_node, 0, NULL, "Capture");
-
-    /* create input MUX if multiple sources are available */
-    if (spec->input_mux.num_items > 1) {
-        static snd_kcontrol_new_t cap_sel = {
-            SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-            "Capture Source",0,0,0,
-            capture_source_info,
-            capture_source_get,
-            capture_source_put,0
-        };
-        if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&cap_sel, codec))) < 0)
-            return err;
-        spec->cur_cap_src = 0;
-        select_input_connection(codec, adc_node, spec->input_mux.items[0].index);
-    }
-    return 0;
+        struct hda_gspec *spec = codec->spec;
+        struct hda_gnode *adc_node = spec->adc_node;
+        int err;
+
+        if (! adc_node)
+                return 0; /* not found */
+
+        /* create capture volume and switch controls if the ADC has an amp */
+        err = create_mixer(codec, adc_node, 0, NULL, "Capture");
+
+        /* create input MUX if multiple sources are available */
+        if (spec->input_mux.num_items > 1) {
+                static struct snd_kcontrol_new cap_sel = {
+                        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                        .name = "Capture Source",
+                        .info = capture_source_info,
+                        .get = capture_source_get,
+                        .put = capture_source_put,
+                };
+                if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&cap_sel, codec))) < 0)
+                        return err;
+                spec->cur_cap_src = 0;
+                select_input_connection(codec, adc_node, spec->input_mux.items[0].index);
+        }
+        return 0;
 }
 
@@ -766 +781 @@
  */
 static int parse_loopback_path(struct hda_codec *codec, struct hda_gspec *spec,
-                               struct hda_gnode *node, struct hda_gnode *dest_node,
-                               const char *type)
-{
-    int i, err;
-
-    if (node->checked)
-        return 0;
-
-    node->checked = 1;
-    if (node == dest_node) {
-        /* loopback connection found */
-        return 1;
-    }
-
-    for (i = 0; i < node->nconns; i++) {
-        struct hda_gnode *child = hda_get_node(spec, node->conn_list[i]);
-        if (! child)
-            continue;
-        err = parse_loopback_path(codec, spec, child, dest_node, type);
-        if (err < 0)
-            return err;
-        else if (err >= 1) {
-            if (err == 1) {
-                err = create_mixer(codec, node, i, type, "Playback");
-                if (err < 0)
-                    return err;
-                if (err > 0)
-                    return 2; /* ok, created */
-                /* not created, maybe in the lower path */
-                err = 1;
-            }
-            /* connect and unmute */
-            if (node->nconns > 1)
-                select_input_connection(codec, node, i);
-            unmute_input(codec, node, i);
-            unmute_output(codec, node);
-            return err;
-        }
-    }
-    return 0;
+                               struct hda_gnode *node, struct hda_gnode *dest_node,
+                               const char *type)
+{
+        int i, err;
+
+        if (node->checked)
+                return 0;
+
+        node->checked = 1;
+        if (node == dest_node) {
+                /* loopback connection found */
+                return 1;
+        }
+
+        for (i = 0; i < node->nconns; i++) {
+                struct hda_gnode *child = hda_get_node(spec, node->conn_list[i]);
+                if (! child)
+                        continue;
+                err = parse_loopback_path(codec, spec, child, dest_node, type);
+                if (err < 0)
+                        return err;
+                else if (err >= 1) {
+                        if (err == 1) {
+                                err = create_mixer(codec, node, i, type, "Playback");
+                                if (err < 0)
+                                        return err;
+                                if (err > 0)
+                                        return 2; /* ok, created */
+                                /* not created, maybe in the lower path */
+                                err = 1;
+                        }
+                        /* connect and unmute */
+                        if (node->nconns > 1)
+                                select_input_connection(codec, node, i);
+                        unmute_input(codec, node, i);
+                        unmute_output(codec, node);
+                        return err;
+                }
+        }
+        return 0;
 }
 
@@ -813 +828 @@
 static int build_loopback_controls(struct hda_codec *codec)
 {
-    struct hda_gspec *spec = codec->spec;
-    struct list_head *p;
-    struct hda_gnode *node;
-    int err;
-    const char *type;
-
-    if (! spec->out_pin_node)
-        return 0;
-
-    list_for_each(p, &spec->nid_list) {
-        node = list_entry(p, struct hda_gnode, list);
-        if (node->type != AC_WID_PIN)
-            continue;
-        /* input capable? */
-        if (! (node->pin_caps & AC_PINCAP_IN))
-            return 0;
-        type = get_input_type(node, NULL);
-        if (type) {
-            if (check_existing_control(codec, type, "Playback"))
-                continue;
-            clear_check_flags(spec);
-            err = parse_loopback_path(codec, spec, spec->out_pin_node,
-                                      node, type);
-            if (err < 0)
-                return err;
-            if (! err)
-                continue;
-        }
-    }
-    return 0;
+        struct hda_gspec *spec = codec->spec;
+        struct list_head *p;
+        struct hda_gnode *node;
+        int err;
+        const char *type;
+
+        if (! spec->out_pin_node)
+                return 0;
+
+        list_for_each(p, &spec->nid_list) {
+                node = list_entry(p, struct hda_gnode, list);
+                if (node->type != AC_WID_PIN)
+                        continue;
+                /* input capable? */
+                if (! (node->pin_caps & AC_PINCAP_IN))
+                        return 0;
+                type = get_input_type(node, NULL);
+                if (type) {
+                        if (check_existing_control(codec, type, "Playback"))
+                                continue;
+                        clear_check_flags(spec);
+                        err = parse_loopback_path(codec, spec, spec->out_pin_node,
+                                                  node, type);
+                        if (err < 0)
+                                return err;
+                        if (! err)
+                                continue;
+                }
+        }
+        return 0;
 }
 
@@ -850 +865 @@
 static int build_generic_controls(struct hda_codec *codec)
 {
-    int err;
-
-    if ((err = build_input_controls(codec)) < 0 ||
-        (err = build_output_controls(codec)) < 0 ||
-        (err = build_loopback_controls(codec)) < 0)
-        return err;
-
-    return 0;
+        int err;
+
+        if ((err = build_input_controls(codec)) < 0 ||
+            (err = build_output_controls(codec)) < 0 ||
+            (err = build_loopback_controls(codec)) < 0)
+                return err;
+
+        return 0;
 }
 
@@ -864 +879 @@
  */
 static struct hda_pcm_stream generic_pcm_playback = {
-    /*.substreams = */1,
-    /*.channels_min = */2,
-    /*.channels_max = */2,
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
 };
 
 static int build_generic_pcms(struct hda_codec *codec)
 {
-    struct hda_gspec *spec = codec->spec;
-    struct hda_pcm *info = &spec->pcm_rec;
-
-    if (! spec->dac_node && ! spec->adc_node) {
-        snd_printd("hda_generic: no PCM found\n");
-        return 0;
-    }
-
-    codec->num_pcms = 1;
-    codec->pcm_info = info;
-
-    info->name = "HDA Generic";
-    if (spec->dac_node) {
-        info->stream[0] = generic_pcm_playback;
-        info->stream[0].nid = spec->dac_node->nid;
-    }
-    if (spec->adc_node) {
-        info->stream[1] = generic_pcm_playback;
-        info->stream[1].nid = spec->adc_node->nid;
-    }
-
-    return 0;
+        struct hda_gspec *spec = codec->spec;
+        struct hda_pcm *info = &spec->pcm_rec;
+
+        if (! spec->dac_node && ! spec->adc_node) {
+                snd_printd("hda_generic: no PCM found\n");
+                return 0;
+        }
+
+        codec->num_pcms = 1;
+        codec->pcm_info = info;
+
+        info->name = "HDA Generic";
+        if (spec->dac_node) {
+                info->stream[0] = generic_pcm_playback;
+                info->stream[0].nid = spec->dac_node->nid;
+        }
+        if (spec->adc_node) {
+                info->stream[1] = generic_pcm_playback;
+                info->stream[1].nid = spec->adc_node->nid;
+        }
+
+        return 0;
 }
 
@@ -899 +914 @@
  */
 static struct hda_codec_ops generic_patch_ops = {
-    /*.build_controls = */build_generic_controls,
-    /*.build_pcms = */build_generic_pcms,0,
-    /*.free = */snd_hda_generic_free,
+        .build_controls = build_generic_controls,
+        .build_pcms = build_generic_pcms,
+        .free = snd_hda_generic_free,
 };
 
@@ -909 +924 @@
 int snd_hda_parse_generic_codec(struct hda_codec *codec)
 {
-    struct hda_gspec *spec;
-    int err;
-
-    spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
-    if (spec == NULL) {
-        printk(KERN_ERR "hda_generic: can't allocate spec\n");
-        return -ENOMEM;
-    }
-    codec->spec = spec;
-    INIT_LIST_HEAD(&spec->nid_list);
-
-    if ((err = build_afg_tree(codec)) < 0)
-        goto error;
-
-    if ((err = parse_input(codec)) < 0 ||
-        (err = parse_output(codec)) < 0)
-        goto error;
-
-    codec->patch_ops = generic_patch_ops;
-
-    return 0;
-
-    error:
-        snd_hda_generic_free(codec);
-        return err;
-}
+        struct hda_gspec *spec;
+        int err;
+
+        if(!codec->afg)
+                return 0;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL) {
+                printk(KERN_ERR "hda_generic: can't allocate spec\n");
+                return -ENOMEM;
+        }
+        codec->spec = spec;
+        INIT_LIST_HEAD(&spec->nid_list);
+
+        if ((err = build_afg_tree(codec)) < 0)
+                goto error;
+
+        if ((err = parse_input(codec)) < 0 ||
+            (err = parse_output(codec)) < 0)
+                goto error;
+
+        codec->patch_ops = generic_patch_ops;
+
+        return 0;
+
+ error:
+        snd_hda_generic_free(codec);
+        return err;
+}

GPL/trunk/alsa-kernel/pci/hda/hda_intel.c

@@ -31 +31 @@
  *
  *  2004.12.01  Major rewrite by tiwai, merged the work of pshou
- *
+ * 
  */
 
@@ -38 +38 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -48 +49 @@
 
 
-static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static char *model[SNDRV_CARDS];
-static int position_fix[SNDRV_CARDS];
-
-//module_param_array(index, int, NULL, 0444);
+static int index = SNDRV_DEFAULT_IDX1;
+static char *id = SNDRV_DEFAULT_STR1;
+static char *model;
+static int position_fix;
+static int probe_mask = -1;
+static int single_cmd;
+
+//module_param(index, int, 0444);
 MODULE_PARM_DESC(index, "Index value for Intel HD audio interface.");
-//module_param_array(id, charp, NULL, 0444);
+//module_param(id, charp, 0444);
 MODULE_PARM_DESC(id, "ID string for Intel HD audio interface.");
-//module_param_array(enable, bool, NULL, 0444);
-MODULE_PARM_DESC(enable, "Enable Intel HD audio interface.");
-//module_param_array(model, charp, NULL, 0444);
+//module_param(model, charp, 0444);
 MODULE_PARM_DESC(model, "Use the given board model.");
-//module_param_array(position_fix, bool, NULL, 0444);
-MODULE_PARM_DESC(position_fix, "Fix DMA pointer (0 = FIFO size, 1 = none, 2 = POSBUF).");
+//module_param(position_fix, int, 0444);
+MODULE_PARM_DESC(position_fix, "Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size).");
+//module_param(probe_mask, int, 0444);
+MODULE_PARM_DESC(probe_mask, "Bitmask to probe codecs (default = -1).");
+//module_param(single_cmd, bool, 0444);
+MODULE_PARM_DESC(single_cmd, "Use single command to communicate with codecs (for debugging only).");
+
+
+/* just for backward compatibility */
+static int enable;
+//module_param(enable, bool, 0444);
 
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
-                        "{Intel, ICH6M},"
-                        "{Intel, ICH7},"
-                        "{Intel, ESB2},"
-                        "{ATI, SB450},"
-                        "{VIA, VT8251},"
-                        "{VIA, VT8237A}}");
+                         "{Intel, ICH6M},"
+                         "{Intel, ICH7},"
+                         "{Intel, ESB2},"
+                         "{Intel, ICH8},"
+                         "{ATI, SB450},"
+                         "{VIA, VT8251},"
+                         "{VIA, VT8237A},"
+                         "{SiS, SIS966},"
+                         "{ULI, M5461}}");
 MODULE_DESCRIPTION("Intel HDA driver");
 
@@ -92 +104 @@
 #define ICH6_REG_INTSTS                 0x24
 #define ICH6_REG_WALCLK                 0x30
-#define ICH6_REG_SYNC                   0x34
+#define ICH6_REG_SYNC                   0x34    
 #define ICH6_REG_CORBLBASE              0x40
 #define ICH6_REG_CORBUBASE              0x44
@@ -142 +154 @@
 
 /* max number of SDs */
-#define MAX_ICH6_DEV            8
+/* ICH, ATI and VIA have 4 playback and 4 capture */
+#define ICH6_CAPTURE_INDEX      0
+#define ICH6_NUM_CAPTURE        4
+#define ICH6_PLAYBACK_INDEX     4
+#define ICH6_NUM_PLAYBACK       4
+
+/* ULI has 6 playback and 5 capture */
+#define ULI_CAPTURE_INDEX       0
+#define ULI_NUM_CAPTURE         5
+#define ULI_PLAYBACK_INDEX      5
+#define ULI_NUM_PLAYBACK        6
+
+/* this number is statically defined for simplicity */
+#define MAX_AZX_DEV             16
+
 /* max number of fragments - we may use more if allocating more pages for BDL */
-#define AZX_MAX_FRAG            (PAGE_SIZE / (MAX_ICH6_DEV * 16))
+#define BDL_SIZE                PAGE_ALIGN(8192)
+#define AZX_MAX_FRAG            (BDL_SIZE / (MAX_AZX_DEV * 16))
 /* max buffer size - no h/w limit, you can increase as you like */
 #define AZX_MAX_BUF_SIZE        (1024*1024*1024)
 /* max number of PCM devics per card */
-#define AZX_MAX_PCMS            8
+#define AZX_MAX_AUDIO_PCMS      6
+#define AZX_MAX_MODEM_PCMS      2
+#define AZX_MAX_PCMS            (AZX_MAX_AUDIO_PCMS + AZX_MAX_MODEM_PCMS)
 
 /* RIRB int mask: overrun[2], response[0] */
@@ -157 +186 @@
 /* STATESTS int mask: SD2,SD1,SD0 */
 #define STATESTS_INT_MASK       0x07
-#define AZX_MAX_CODECS          4
+#define AZX_MAX_CODECS          4
 
 /* SD_CTL bits */
@@ -178 +207 @@
 #define ICH6_INT_CTRL_EN        0x40000000      /* controller interrupt enable bit */
 #define ICH6_INT_GLOBAL_EN      0x80000000      /* global interrupt enable bit */
+
+/* GCTL unsolicited response enable bit */
+#define ICH6_GCTL_UREN          (1<<8)
 
 /* GCTL reset bit */
@@ -192 +224 @@
 /* position fix mode */
 enum {
-    POS_FIX_FIFO,
-    POS_FIX_NONE,
-    POS_FIX_POSBUF
+        POS_FIX_AUTO,
+        POS_FIX_NONE,
+        POS_FIX_POSBUF,
+        POS_FIX_FIFO,
 };
 
 /* Defines for ATI HD Audio support in SB450 south bridge */
-#define ATI_SB450_HDAUDIO_PCI_DEVICE_ID     0x437b
 #define ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR   0x42
 #define ATI_SB450_HDAUDIO_ENABLE_SNOOP      0x02
 
-/*
- * Use CORB/RIRB for communication from/to codecs.
- * This is the way recommended by Intel (see below).
- */
-#define USE_CORB_RIRB
-
-/*
- */
-
-typedef struct snd_azx azx_t;
-typedef struct snd_azx_rb azx_rb_t;
-typedef struct snd_azx_dev azx_dev_t;
-
-struct snd_azx_dev {
+/* Defines for Nvidia HDA support */
+#define NVIDIA_HDA_TRANSREG_ADDR      0x4e
+#define NVIDIA_HDA_ENABLE_COHBITS     0x0f
+
+/*
+ */
+
+struct azx_dev {
         u32 *bdl;                       /* virtual address of the BDL */
         dma_addr_t bdl_addr;            /* physical address of the BDL */
@@ -224 +250 @@
         unsigned int frags;             /* number for period in the play buffer */
         unsigned int fifo_size;         /* FIFO size */
+        unsigned int last_pos;          /* last updated period position */
 
         void __iomem *sd_addr;          /* stream descriptor pointer */
@@ -230 +257 @@
 
         /* pcm support */
-        snd_pcm_substream_t *substream; /* assigned substream, set in PCM open */
+        struct snd_pcm_substream *substream;    /* assigned substream, set in PCM open */
         unsigned int format_val;        /* format value to be set in the controller and the codec */
         unsigned char stream_tag;       /* assigned stream */
@@ -237 +264 @@
         unsigned int opened: 1;
         unsigned int running: 1;
+        unsigned int period_updating: 1;
 };
 
 /* CORB/RIRB */
-struct snd_azx_rb {
+struct azx_rb {
         u32 *buf;               /* CORB/RIRB buffer
                                  * Each CORB entry is 4byte, RIRB is 8byte
@@ -251 +279 @@
 };
 
-struct snd_azx {
-        snd_card_t *card;
+struct azx {
+        struct snd_card *card;
         struct pci_dev *pci;
+
+        /* chip type specific */
+        int driver_type;
+        int playback_streams;
+        int playback_index_offset;
+        int capture_streams;
+        int capture_index_offset;
+        int num_streams;
 
         /* pci resources */
@@ -264 +300 @@
         struct semaphore open_mutex;
 
-        /* streams */
-        azx_dev_t azx_dev[MAX_ICH6_DEV];
+        /* streams (x num_streams) */
+        struct azx_dev *azx_dev;
 
         /* PCM */
         unsigned int pcm_devs;
-        snd_pcm_t *pcm[AZX_MAX_PCMS];
+        struct snd_pcm *pcm[AZX_MAX_PCMS];
 
         /* HD codec */
@@ -276 +312 @@
 
         /* CORB/RIRB */
-        azx_rb_t corb;
-        azx_rb_t rirb;
+        struct azx_rb corb;
+        struct azx_rb rirb;
 
         /* BDL, CORB/RIRB and position buffers */
         struct snd_dma_buffer bdl;
         struct snd_dma_buffer rb;
-        struct snd_dma_buffer posbuf;
-
-        /* flags */
-        int position_fix;
+        struct snd_dma_buffer posbuf;
+
+        /* flags */
+        int position_fix;
+        unsigned int initialized: 1;
+        unsigned int single_cmd: 1;
 };
 
+/* driver types */
+enum {
+        AZX_DRIVER_ICH,
+        AZX_DRIVER_ATI,
+        AZX_DRIVER_VIA,
+        AZX_DRIVER_SIS,
+        AZX_DRIVER_ULI,
+        AZX_DRIVER_NVIDIA,
+};
+
+static char *driver_short_names[] __devinitdata = {
+        [AZX_DRIVER_ICH] = "HDA Intel",
+        [AZX_DRIVER_ATI] = "HDA ATI SB",
+        [AZX_DRIVER_VIA] = "HDA VIA VT82xx",
+        [AZX_DRIVER_SIS] = "HDA SIS966",
+        [AZX_DRIVER_ULI] = "HDA ULI M5461",
+        [AZX_DRIVER_NVIDIA] = "HDA NVidia",
+};
+
 /*
  * macros for easy use
  */
 #define azx_writel(chip,reg,value) \
-        writel(value, (char*)(chip)->remap_addr + ICH6_REG_##reg)
+        writel(value, (chip)->remap_addr + ICH6_REG_##reg)
 #define azx_readl(chip,reg) \
-        readl((char*)(chip)->remap_addr + ICH6_REG_##reg)
+        readl((chip)->remap_addr + ICH6_REG_##reg)
 #define azx_writew(chip,reg,value) \
-        writew(value, (char*)(chip)->remap_addr + ICH6_REG_##reg)
+        writew(value, (chip)->remap_addr + ICH6_REG_##reg)
 #define azx_readw(chip,reg) \
-        readw((char*)(chip)->remap_addr + ICH6_REG_##reg)
+        readw((chip)->remap_addr + ICH6_REG_##reg)
 #define azx_writeb(chip,reg,value) \
-        writeb(value, (char*)(chip)->remap_addr + ICH6_REG_##reg)
+        writeb(value, (chip)->remap_addr + ICH6_REG_##reg)
 #define azx_readb(chip,reg) \
-        readb((char*)(chip)->remap_addr + ICH6_REG_##reg)
+        readb((chip)->remap_addr + ICH6_REG_##reg)
 
 #define azx_sd_writel(dev,reg,value) \
-        writel(value, (char*)(dev)->sd_addr + ICH6_REG_##reg)
+        writel(value, (dev)->sd_addr + ICH6_REG_##reg)
 #define azx_sd_readl(dev,reg) \
-        readl((char*)(dev)->sd_addr + ICH6_REG_##reg)
+        readl((dev)->sd_addr + ICH6_REG_##reg)
 #define azx_sd_writew(dev,reg,value) \
-        writew(value, (char*)(dev)->sd_addr + ICH6_REG_##reg)
+        writew(value, (dev)->sd_addr + ICH6_REG_##reg)
 #define azx_sd_readw(dev,reg) \
-        readw((char*)(dev)->sd_addr + ICH6_REG_##reg)
+        readw((dev)->sd_addr + ICH6_REG_##reg)
 #define azx_sd_writeb(dev,reg,value) \
-        writeb(value, (char*)(dev)->sd_addr + ICH6_REG_##reg)
+        writeb(value, (dev)->sd_addr + ICH6_REG_##reg)
 #define azx_sd_readb(dev,reg) \
-        readb((char*)(dev)->sd_addr + ICH6_REG_##reg)
+        readb((dev)->sd_addr + ICH6_REG_##reg)
 
 /* for pcm support */
-#define get_azx_dev(substream) (azx_dev_t*)(substream->runtime->private_data)
+#define get_azx_dev(substream) (substream->runtime->private_data)
 
 /* Get the upper 32bit of the given dma_addr_t
@@ -330 +387 @@
  */
 
-#ifdef USE_CORB_RIRB
 /*
  * CORB / RIRB interface
  */
-static int azx_alloc_cmd_io(azx_t *chip)
+static int azx_alloc_cmd_io(struct azx *chip)
 {
         int err;
@@ -348 +404 @@
 }
 
-static void azx_init_cmd_io(azx_t *chip)
+static void azx_init_cmd_io(struct azx *chip)
 {
         /* CORB set up */
@@ -356 +412 @@
         azx_writel(chip, CORBUBASE, upper_32bit(chip->corb.addr));
 
+        /* set the corb size to 256 entries (ULI requires explicitly) */
+        azx_writeb(chip, CORBSIZE, 0x02);
         /* set the corb write pointer to 0 */
         azx_writew(chip, CORBWP, 0);
@@ -369 +427 @@
         azx_writel(chip, RIRBUBASE, upper_32bit(chip->rirb.addr));
 
+        /* set the rirb size to 256 entries (ULI requires explicitly) */
+        azx_writeb(chip, RIRBSIZE, 0x02);
         /* reset the rirb hw write pointer */
         azx_writew(chip, RIRBWP, ICH6_RBRWP_CLR);
@@ -374 +434 @@
         azx_writew(chip, RINTCNT, 1);
         /* enable rirb dma and response irq */
-#ifdef USE_CORB_RIRB
         azx_writeb(chip, RIRBCTL, ICH6_RBCTL_DMA_EN | ICH6_RBCTL_IRQ_EN);
-#else
-        azx_writeb(chip, RIRBCTL, ICH6_RBCTL_DMA_EN);
-#endif
         chip->rirb.rp = chip->rirb.cmds = 0;
 }
 
-static void azx_free_cmd_io(azx_t *chip)
+static void azx_free_cmd_io(struct azx *chip)
 {
         /* disable ringbuffer DMAs */
@@ -393 +449 @@
                         unsigned int verb, unsigned int para)
 {
-        azx_t *chip = codec->bus->private_data;
+        struct azx *chip = codec->bus->private_data;
         unsigned int wp;
         u32 val;
@@ -420 +476 @@
 
 /* retrieve RIRB entry - called from interrupt handler */
-static void azx_update_rirb(azx_t *chip)
+static void azx_update_rirb(struct azx *chip)
 {
         unsigned int rp, wp;
@@ -429 +485 @@
                 return;
         chip->rirb.wp = wp;
-
+                
         while (chip->rirb.rp != wp) {
                 chip->rirb.rp++;
@@ -449 +505 @@
 static unsigned int azx_get_response(struct hda_codec *codec)
 {
-        azx_t *chip = codec->bus->private_data;
+        struct azx *chip = codec->bus->private_data;
         int timeout = 50;
 
         while (chip->rirb.cmds) {
                 if (! --timeout) {
-                        snd_printk(KERN_ERR "azx_get_response timeout\n");
+                        if (printk_ratelimit())
+                                snd_printk(KERN_ERR
+                                        "azx_get_response timeout\n");
                         chip->rirb.rp = azx_readb(chip, RIRBWP);
                         chip->rirb.cmds = 0;
@@ -464 +522 @@
 }
 
-#else
 /*
  * Use the single immediate command instead of CORB/RIRB for simplicity
@@ -475 +532 @@
  */
 
-#define azx_alloc_cmd_io(chip)  0
-#define azx_init_cmd_io(chip)
-#define azx_free_cmd_io(chip)
-
 /* send a command */
-static int azx_send_cmd(struct hda_codec *codec, hda_nid_t nid, int direct,
-                        unsigned int verb, unsigned int para)
-{
-        azx_t *chip = codec->bus->private_data;
+static int azx_single_send_cmd(struct hda_codec *codec, hda_nid_t nid,
+                               int direct, unsigned int verb,
+                               unsigned int para)
+{
+        struct azx *chip = codec->bus->private_data;
         u32 val;
         int timeout = 50;
@@ -509 +563 @@
 
 /* receive a response */
-static unsigned int azx_get_response(struct hda_codec *codec)
-{
-        azx_t *chip = codec->bus->private_data;
+static unsigned int azx_single_get_response(struct hda_codec *codec)
+{
+        struct azx *chip = codec->bus->private_data;
         int timeout = 50;
 
@@ -524 +578 @@
 }
 
-#define azx_update_rirb(chip)
-
-#endif /* USE_CORB_RIRB */
-
 /* reset codec link */
-static int azx_reset(azx_t *chip)
+static int azx_reset(struct azx *chip)
 {
         int count;
@@ -561 +611 @@
         }
 
+        /* Accept unsolicited responses */
+        azx_writel(chip, GCTL, azx_readl(chip, GCTL) | ICH6_GCTL_UREN);
+
         /* detect codecs */
         if (! chip->codec_mask) {
@@ -573 +626 @@
 /*
  * Lowlevel interface
- */
+ */  
 
 /* enable interrupts */
-static void azx_int_enable(azx_t *chip)
+static void azx_int_enable(struct azx *chip)
 {
         /* enable controller CIE and GIE */
@@ -584 +637 @@
 
 /* disable interrupts */
-static void azx_int_disable(azx_t *chip)
+static void azx_int_disable(struct azx *chip)
 {
         int i;
 
         /* disable interrupts in stream descriptor */
-        for (i = 0; i < MAX_ICH6_DEV; i++) {
-                azx_dev_t *azx_dev = &chip->azx_dev[i];
+        for (i = 0; i < chip->num_streams; i++) {
+                struct azx_dev *azx_dev = &chip->azx_dev[i];
                 azx_sd_writeb(azx_dev, SD_CTL,
                               azx_sd_readb(azx_dev, SD_CTL) & ~SD_INT_MASK);
@@ -604 +657 @@
 
 /* clear interrupts */
-static void azx_int_clear(azx_t *chip)
+static void azx_int_clear(struct azx *chip)
 {
         int i;
 
         /* clear stream status */
-        for (i = 0; i < MAX_ICH6_DEV; i++) {
-                azx_dev_t *azx_dev = &chip->azx_dev[i];
+        for (i = 0; i < chip->num_streams; i++) {
+                struct azx_dev *azx_dev = &chip->azx_dev[i];
                 azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK);
         }
@@ -625 +678 @@
 
 /* start a stream */
-static void azx_stream_start(azx_t *chip, azx_dev_t *azx_dev)
+static void azx_stream_start(struct azx *chip, struct azx_dev *azx_dev)
 {
         /* enable SIE */
@@ -636 +689 @@
 
 /* stop a stream */
-static void azx_stream_stop(azx_t *chip, azx_dev_t *azx_dev)
+static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
 {
         /* stop DMA */
@@ -651 +704 @@
  * initialize the chip
  */
-static void azx_init_chip(azx_t *chip)
-{
-    unsigned char tcsel_reg, ati_misc_cntl2;
-
-    /* Clear bits 0-2 of PCI register TCSEL (at offset 0x44)
-     * TCSEL == Traffic Class Select Register, which sets PCI express QOS
-     * Ensuring these bits are 0 clears playback static on some HD Audio codecs
-     */
-    pci_read_config_byte (chip->pci, ICH6_PCIREG_TCSEL, &tcsel_reg);
-    pci_write_config_byte(chip->pci, ICH6_PCIREG_TCSEL, tcsel_reg & 0xf8);
-
-    /* reset controller */
-    azx_reset(chip);
-
-    /* initialize interrupts */
-    azx_int_clear(chip);
-    azx_int_enable(chip);
-
-    /* initialize the codec command I/O */
-    azx_init_cmd_io(chip);
-
-    if (chip->position_fix == POS_FIX_POSBUF) {
-        /* program the position buffer */
-        azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr);
-        azx_writel(chip, DPUBASE, upper_32bit(chip->posbuf.addr));
-    }
-    /* For ATI SB450 azalia HD audio, we need to enable snoop */
-    if (chip->pci->vendor == PCI_VENDOR_ID_ATI &&
-        chip->pci->device == ATI_SB450_HDAUDIO_PCI_DEVICE_ID) {
-        pci_read_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR,
-                             &ati_misc_cntl2);
-        pci_write_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR,
-                              (ati_misc_cntl2 & 0xf8) | ATI_SB450_HDAUDIO_ENABLE_SNOOP);
-    }
+static void azx_init_chip(struct azx *chip)
+{
+        unsigned char reg;
+
+        /* Clear bits 0-2 of PCI register TCSEL (at offset 0x44)
+         * TCSEL == Traffic Class Select Register, which sets PCI express QOS
+         * Ensuring these bits are 0 clears playback static on some HD Audio codecs
+         */
+        pci_read_config_byte (chip->pci, ICH6_PCIREG_TCSEL, &reg);
+        pci_write_config_byte(chip->pci, ICH6_PCIREG_TCSEL, reg & 0xf8);
+
+        /* reset controller */
+        azx_reset(chip);
+
+        /* initialize interrupts */
+        azx_int_clear(chip);
+        azx_int_enable(chip);
+
+        /* initialize the codec command I/O */
+        if (! chip->single_cmd)
+                azx_init_cmd_io(chip);
+
+        /* program the position buffer */
+        azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr);
+        azx_writel(chip, DPUBASE, upper_32bit(chip->posbuf.addr));
+
+        switch (chip->driver_type) {
+        case AZX_DRIVER_ATI:
+                /* For ATI SB450 azalia HD audio, we need to enable snoop */
+                pci_read_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
+                                     &reg);
+                pci_write_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
+                                      (reg & 0xf8) | ATI_SB450_HDAUDIO_ENABLE_SNOOP);
+                break;
+        case AZX_DRIVER_NVIDIA:
+                /* For NVIDIA HDA, enable snoop */
+                pci_read_config_byte(chip->pci,NVIDIA_HDA_TRANSREG_ADDR, &reg);
+                pci_write_config_byte(chip->pci,NVIDIA_HDA_TRANSREG_ADDR,
+                                      (reg & 0xf0) | NVIDIA_HDA_ENABLE_COHBITS);
+                break;
+        }
 }
 
@@ -693 +753 @@
 static irqreturn_t azx_interrupt(int irq, void* dev_id, struct pt_regs *regs)
 {
-        azx_t *chip = dev_id;
-        azx_dev_t *azx_dev;
+        struct azx *chip = dev_id;
+        struct azx_dev *azx_dev;
         u32 status;
         int i;
@@ -705 +765 @@
                 return IRQ_NONE;
         }
-
-        for (i = 0; i < MAX_ICH6_DEV; i++) {
+        
+        for (i = 0; i < chip->num_streams; i++) {
                 azx_dev = &chip->azx_dev[i];
                 if (status & azx_dev->sd_int_sta_mask) {
                         azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK);
                         if (azx_dev->substream && azx_dev->running) {
+                                azx_dev->period_updating = 1;
                                 spin_unlock(&chip->reg_lock);
                                 snd_pcm_period_elapsed(azx_dev->substream);
                                 spin_lock(&chip->reg_lock);
+                                azx_dev->period_updating = 0;
                         }
                 }
@@ -721 +783 @@
         status = azx_readb(chip, RIRBSTS);
         if (status & RIRB_INT_MASK) {
-                if (status & RIRB_INT_RESPONSE)
+                if (! chip->single_cmd && (status & RIRB_INT_RESPONSE))
                         azx_update_rirb(chip);
                 azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);
@@ -732 +794 @@
 #endif
         spin_unlock(&chip->reg_lock);
-
+        
         return IRQ_HANDLED;
 }
@@ -740 +802 @@
  * set up BDL entries
  */
-static void azx_setup_periods(azx_dev_t *azx_dev)
+static void azx_setup_periods(struct azx_dev *azx_dev)
 {
         u32 *bdl = azx_dev->bdl;
@@ -769 +831 @@
  * set up the SD for streaming
  */
-static int azx_setup_controller(azx_t *chip, azx_dev_t *azx_dev)
+static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
 {
         unsigned char val;
@@ -814 +876 @@
         azx_sd_writel(azx_dev, SD_BDLPU, upper_32bit(azx_dev->bdl_addr));
 
-        if (chip->position_fix == POS_FIX_POSBUF) {
-            /* enable the position buffer */
-            if (! (azx_readl(chip, DPLBASE) & ICH6_DPLBASE_ENABLE))
-                azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr | ICH6_DPLBASE_ENABLE);
-        }
-
-        /* set the interrupt enable bits in the descriptor control register */
+        /* enable the position buffer */
+        if (! (azx_readl(chip, DPLBASE) & ICH6_DPLBASE_ENABLE))
+                azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr | ICH6_DPLBASE_ENABLE);
+
+        /* set the interrupt enable bits in the descriptor control register */
         azx_sd_writel(azx_dev, SD_CTL, azx_sd_readl(azx_dev, SD_CTL) | SD_INT_MASK);
 
@@ -831 +891 @@
  */
 
-static int __devinit azx_codec_create(azx_t *chip, const char *model)
+static int __devinit azx_codec_create(struct azx *chip, const char *model)
 {
         struct hda_bus_template bus_temp;
@@ -840 +900 @@
         bus_temp.modelname = model;
         bus_temp.pci = chip->pci;
-        bus_temp.ops.command = azx_send_cmd;
-        bus_temp.ops.get_response = azx_get_response;
+        if (chip->single_cmd) {
+                bus_temp.ops.command = azx_single_send_cmd;
+                bus_temp.ops.get_response = azx_single_get_response;
+        } else {
+                bus_temp.ops.command = azx_send_cmd;
+                bus_temp.ops.get_response = azx_get_response;
+        }
 
         if ((err = snd_hda_bus_new(chip->card, &bus_temp, &chip->bus)) < 0)
@@ -848 +913 @@
         codecs = 0;
         for (c = 0; c < AZX_MAX_CODECS; c++) {
-                if (chip->codec_mask & (1 << c)) {
+                if ((chip->codec_mask & (1 << c)) & probe_mask) {
                         err = snd_hda_codec_new(chip->bus, c, NULL);
                         if (err < 0)
@@ -869 +934 @@
 
 /* assign a stream for the PCM */
-static inline azx_dev_t *azx_assign_device(azx_t *chip, int stream)
-{
-        int dev, i;
-        dev = stream == SNDRV_PCM_STREAM_PLAYBACK ? 4 : 0;
-        for (i = 0; i < 4; i++, dev++)
+static inline struct azx_dev *azx_assign_device(struct azx *chip, int stream)
+{
+        int dev, i, nums;
+        if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                dev = chip->playback_index_offset;
+                nums = chip->playback_streams;
+        } else {
+                dev = chip->capture_index_offset;
+                nums = chip->capture_streams;
+        }
+        for (i = 0; i < nums; i++, dev++)
                 if (! chip->azx_dev[dev].opened) {
                         chip->azx_dev[dev].opened = 1;
@@ -882 +953 @@
 
 /* release the assigned stream */
-static inline void azx_release_device(azx_dev_t *azx_dev)
+static inline void azx_release_device(struct azx_dev *azx_dev)
 {
         azx_dev->opened = 0;
 }
 
-static snd_pcm_hardware_t azx_pcm_hw = {
-        /*.info =             */(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+static struct snd_pcm_hardware azx_pcm_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_MMAP_VALID |
-                                 SNDRV_PCM_INFO_PAUSE |
-                                 SNDRV_PCM_INFO_RESUME),
-        /*.formats =          */  SNDRV_PCM_FMTBIT_S16_LE,
-        /*.rates =            */  SNDRV_PCM_RATE_48000,
-        /*.rate_min =         */  48000,
-        /*.rate_max =         */  48000,
-        /*.channels_min =     */        2,
-        /*.channels_max =     */        2,
-        /*.buffer_bytes_max = */  AZX_MAX_BUF_SIZE,
-        /*.period_bytes_min = */  128,
-        /*.period_bytes_max = */  AZX_MAX_BUF_SIZE / 2,
-        /*.periods_min =      */        2,
-        /*.periods_max =      */        AZX_MAX_FRAG,
-        /*.fifo_size =        */  0,
+                                 SNDRV_PCM_INFO_PAUSE /*|*/
+                                 /*SNDRV_PCM_INFO_RESUME*/),
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_48000,
+        .rate_min =             48000,
+        .rate_max =             48000,
+        .channels_min =         2,
+        .channels_max =         2,
+        .buffer_bytes_max =     AZX_MAX_BUF_SIZE,
+        .period_bytes_min =     128,
+        .period_bytes_max =     AZX_MAX_BUF_SIZE / 2,
+        .periods_min =          2,
+        .periods_max =          AZX_MAX_FRAG,
+        .fifo_size =            0,
 };
 
 struct azx_pcm {
-        azx_t *chip;
+        struct azx *chip;
         struct hda_codec *codec;
         struct hda_pcm_stream *hinfo[2];
 };
 
-static int azx_pcm_open(snd_pcm_substream_t *substream)
+static int azx_pcm_open(struct snd_pcm_substream *substream)
 {
         struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
         struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];
-        azx_t *chip = apcm->chip;
-        azx_dev_t *azx_dev;
-        snd_pcm_runtime_t *runtime = substream->runtime;
+        struct azx *chip = apcm->chip;
+        struct azx_dev *azx_dev;
+        struct snd_pcm_runtime *runtime = substream->runtime;
         unsigned long flags;
         int err;
@@ -951 +1022 @@
 }
 
-static int azx_pcm_close(snd_pcm_substream_t *substream)
+static int azx_pcm_close(struct snd_pcm_substream *substream)
 {
         struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
         struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];
-        azx_t *chip = apcm->chip;
-        azx_dev_t *azx_dev = get_azx_dev(substream);
+        struct azx *chip = apcm->chip;
+        struct azx_dev *azx_dev = get_azx_dev(substream);
         unsigned long flags;
 
@@ -970 +1041 @@
 }
 
-static int azx_pcm_hw_params(snd_pcm_substream_t *substream, snd_pcm_hw_params_t *hw_params)
+static int azx_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *hw_params)
 {
         return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
 }
 
-static int azx_pcm_hw_free(snd_pcm_substream_t *substream)
+static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
 {
         struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
-        azx_dev_t *azx_dev = get_azx_dev(substream);
+        struct azx_dev *azx_dev = get_azx_dev(substream);
         struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];
 
@@ -991 +1062 @@
 }
 
-static int azx_pcm_prepare(snd_pcm_substream_t *substream)
+static int azx_pcm_prepare(struct snd_pcm_substream *substream)
 {
         struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
-        azx_t *chip = apcm->chip;
-        azx_dev_t *azx_dev = get_azx_dev(substream);
+        struct azx *chip = apcm->chip;
+        struct azx_dev *azx_dev = get_azx_dev(substream);
         struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];
-        snd_pcm_runtime_t *runtime = substream->runtime;
+        struct snd_pcm_runtime *runtime = substream->runtime;
 
         azx_dev->bufsize = snd_pcm_lib_buffer_bytes(substream);
@@ -1020 +1091 @@
         else
                 azx_dev->fifo_size = 0;
+        azx_dev->last_pos = 0;
 
         return hinfo->ops.prepare(hinfo, apcm->codec, azx_dev->stream_tag,
@@ -1025 +1097 @@
 }
 
-static int azx_pcm_trigger(snd_pcm_substream_t *substream, int cmd)
+static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
-        azx_dev_t *azx_dev = get_azx_dev(substream);
-        azx_t *chip = apcm->chip;
+        struct azx_dev *azx_dev = get_azx_dev(substream);
+        struct azx *chip = apcm->chip;
         int err = 0;
 
@@ -1041 +1113 @@
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
         case SNDRV_PCM_TRIGGER_STOP:
                 azx_stream_stop(chip, azx_dev);
@@ -1050 +1123 @@
         spin_unlock(&chip->reg_lock);
         if (cmd == SNDRV_PCM_TRIGGER_PAUSE_PUSH ||
+            cmd == SNDRV_PCM_TRIGGER_SUSPEND ||
             cmd == SNDRV_PCM_TRIGGER_STOP) {
                 int timeout = 5000;
@@ -1058 +1132 @@
 }
 
-static snd_pcm_uframes_t azx_pcm_pointer(snd_pcm_substream_t *substream)
-{
-    struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
-    azx_t *chip = apcm->chip;
-    azx_dev_t *azx_dev = get_azx_dev(substream);
-    unsigned int pos;
-
-    if (chip->position_fix == POS_FIX_POSBUF) {
-        /* use the position buffer */
-        pos = *azx_dev->posbuf;
-    } else {
-        /* read LPIB */
-        pos = azx_sd_readl(azx_dev, SD_LPIB);
-        if (chip->position_fix == POS_FIX_FIFO)
-            pos += azx_dev->fifo_size;
-    }
-    if (pos >= azx_dev->bufsize)
-        pos = 0;
-    return bytes_to_frames(substream->runtime, pos);
-}
-
-static snd_pcm_ops_t azx_pcm_ops = {
-        /*.open = */azx_pcm_open,
-        /*.close = */azx_pcm_close,
-        /*.ioctl = */snd_pcm_lib_ioctl,
-        /*.hw_params = */azx_pcm_hw_params,
-        /*.hw_free = */azx_pcm_hw_free,
-        /*.prepare = */azx_pcm_prepare,
-        /*.trigger = */azx_pcm_trigger,
-        /*.pointer = */azx_pcm_pointer,0,0,0,0
+static snd_pcm_uframes_t azx_pcm_pointer(struct snd_pcm_substream *substream)
+{
+        struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
+        struct azx *chip = apcm->chip;
+        struct azx_dev *azx_dev = get_azx_dev(substream);
+        unsigned int pos;
+
+        if (chip->position_fix == POS_FIX_POSBUF) {
+                /* use the position buffer */
+                pos = *azx_dev->posbuf;
+        } else {
+                /* read LPIB */
+                pos = azx_sd_readl(azx_dev, SD_LPIB);
+                if (chip->position_fix == POS_FIX_FIFO)
+                        pos += azx_dev->fifo_size;
+        }
+        if (pos >= azx_dev->bufsize)
+                pos = 0;
+        return bytes_to_frames(substream->runtime, pos);
+}
+
+static struct snd_pcm_ops azx_pcm_ops = {
+        .open = azx_pcm_open,
+        .close = azx_pcm_close,
+        .ioctl = snd_pcm_lib_ioctl,
+        .hw_params = azx_pcm_hw_params,
+        .hw_free = azx_pcm_hw_free,
+        .prepare = azx_pcm_prepare,
+        .trigger = azx_pcm_trigger,
+        .pointer = azx_pcm_pointer,
 };
 
-static void azx_pcm_free(snd_pcm_t *pcm)
+static void azx_pcm_free(struct snd_pcm *pcm)
 {
         kfree(pcm->private_data);
 }
 
-static int __devinit create_codec_pcm(azx_t *chip, struct hda_codec *codec,
+static int __devinit create_codec_pcm(struct azx *chip, struct hda_codec *codec,
                                       struct hda_pcm *cpcm, int pcm_dev)
 {
         int err;
-        snd_pcm_t *pcm;
+        struct snd_pcm *pcm;
         struct azx_pcm *apcm;
 
@@ -1128 +1202 @@
                                               1024 * 64, 1024 * 128);
         chip->pcm[pcm_dev] = pcm;
+        chip->pcm_devs = pcm_dev + 1;
 
         return 0;
 }
 
-static int __devinit azx_pcm_create(azx_t *chip)
+static int __devinit azx_pcm_create(struct azx *chip)
 {
         struct list_head *p;
@@ -1142 +1217 @@
                 return err;
 
+        /* create audio PCMs */
         pcm_dev = 0;
         list_for_each(p, &chip->bus->codec_list) {
                 codec = list_entry(p, struct hda_codec, list);
                 for (c = 0; c < codec->num_pcms; c++) {
-                        if (pcm_dev >= AZX_MAX_PCMS) {
-                                snd_printk(KERN_ERR SFX "Too many PCMs\n");
+                        if (codec->pcm_info[c].is_modem)
+                                continue; /* create later */
+                        if (pcm_dev >= AZX_MAX_AUDIO_PCMS) {
+                                snd_printk(KERN_ERR SFX "Too many audio PCMs\n");
                                 return -EINVAL;
                         }
@@ -1156 +1234 @@
                 }
         }
+
+        /* create modem PCMs */
+        pcm_dev = AZX_MAX_AUDIO_PCMS;
+        list_for_each(p, &chip->bus->codec_list) {
+                codec = list_entry(p, struct hda_codec, list);
+                for (c = 0; c < codec->num_pcms; c++) {
+                        if (! codec->pcm_info[c].is_modem)
+                                continue; /* already created */
+                        if (pcm_dev >= AZX_MAX_PCMS) {
+                                snd_printk(KERN_ERR SFX "Too many modem PCMs\n");
+                                return -EINVAL;
+                        }
+                        err = create_codec_pcm(chip, codec, &codec->pcm_info[c], pcm_dev);
+                        if (err < 0)
+                                return err;
+                        chip->pcm[pcm_dev]->dev_class = SNDRV_PCM_CLASS_MODEM;
+                        pcm_dev++;
+                }
+        }
         return 0;
 }
@@ -1162 +1259 @@
  * mixer creation - all stuff is implemented in hda module
  */
-static int __devinit azx_mixer_create(azx_t *chip)
+static int __devinit azx_mixer_create(struct azx *chip)
 {
         return snd_hda_build_controls(chip->bus);
@@ -1171 +1268 @@
  * initialize SD streams
  */
-static int __devinit azx_init_stream(azx_t *chip)
+static int __devinit azx_init_stream(struct azx *chip)
 {
         int i;
@@ -1178 +1275 @@
          * assign the starting bdl address to each stream (device) and initialize
          */
-        for (i = 0; i < MAX_ICH6_DEV; i++) {
+        for (i = 0; i < chip->num_streams; i++) {
                 unsigned int off = sizeof(u32) * (i * AZX_MAX_FRAG * 4);
-                azx_dev_t *azx_dev = &chip->azx_dev[i];
+                struct azx_dev *azx_dev = &chip->azx_dev[i];
                 azx_dev->bdl = (u32 *)(chip->bdl.area + off);
-                azx_dev->bdl_addr = chip->bdl.addr + off;
-                if (chip->position_fix == POS_FIX_POSBUF)
-                    azx_dev->posbuf = (volatile u32 *)(chip->posbuf.area + i * 8);
+                azx_dev->bdl_addr = chip->bdl.addr + off;
+                azx_dev->posbuf = (volatile u32 *)(chip->posbuf.area + i * 8);
                 /* offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */
-                azx_dev->sd_addr = (char*)chip->remap_addr + (0x20 * i + 0x80);
+                azx_dev->sd_addr = chip->remap_addr + (0x20 * i + 0x80);
                 /* int mask: SDI0=0x01, SDI1=0x02, ... SDO3=0x80 */
                 azx_dev->sd_int_sta_mask = 1 << i;
@@ -1202 +1298 @@
  * power management
  */
-static int azx_suspend(snd_card_t *card, unsigned int state)
-{
-        azx_t *chip = card->pm_private_data;
+static int azx_suspend(struct pci_dev *pci, pm_message_t state)
+{
+        struct snd_card *card = pci_get_drvdata(pci);
+        struct azx *chip = card->private_data;
         int i;
 
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         for (i = 0; i < chip->pcm_devs; i++)
-                if (chip->pcm[i])
-                        snd_pcm_suspend_all(chip->pcm[i]);
+                snd_pcm_suspend_all(chip->pcm[i]);
         snd_hda_suspend(chip->bus, state);
-        azx_free_cmd_io(chip);
-        pci_disable_device(chip->pci);
+        if (! chip->single_cmd)
+                azx_free_cmd_io(chip);
+        pci_disable_device(pci);
+        pci_save_state(pci);
         return 0;
 }
 
-static int azx_resume(snd_card_t *card, unsigned int state)
-{
-        azx_t *chip = card->pm_private_data;
-
-        pci_enable_device(chip->pci);
-        pci_set_master(chip->pci);
+static int azx_resume(struct pci_dev *pci)
+{
+        struct snd_card *card = pci_get_drvdata(pci);
+        struct azx *chip = card->private_data;
+
+        pci_restore_state(pci);
+        pci_enable_device(pci);
+        pci_set_master(pci);
         azx_init_chip(chip);
-        snd_hda_resume(chip->bus, state);
+        snd_hda_resume(chip->bus);
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
         return 0;
 }
@@ -1232 +1334 @@
  * destructor
  */
-static int azx_free(azx_t *chip)
-{
-        if (chip->remap_addr) {
+static int azx_free(struct azx *chip)
+{
+        if (chip->initialized) {
                 int i;
 
-                for (i = 0; i < MAX_ICH6_DEV; i++)
+                for (i = 0; i < chip->num_streams; i++)
                         azx_stream_stop(chip, &chip->azx_dev[i]);
 
@@ -1245 +1347 @@
 
                 /* disable CORB/RIRB */
-                azx_free_cmd_io(chip);
+                if (! chip->single_cmd)
+                        azx_free_cmd_io(chip);
 
                 /* disable position buffer */
@@ -1253 +1356 @@
                 /* wait a little for interrupts to finish */
                 msleep(1);
-
+        }
+
+        if (chip->remap_addr)
                 iounmap(chip->remap_addr);
-        }
-
         if (chip->irq >= 0)
                 free_irq(chip->irq, (void*)chip);
@@ -1268 +1371 @@
         pci_release_regions(chip->pci);
         pci_disable_device(chip->pci);
+        kfree(chip->azx_dev);
         kfree(chip);
 
@@ -1273 +1377 @@
 }
 
-static int azx_dev_free(snd_device_t *device)
+static int azx_dev_free(struct snd_device *device)
 {
         return azx_free(device->device_data);
@@ -1281 +1385 @@
  * constructor
  */
-static int __devinit azx_create(snd_card_t *card, struct pci_dev *pci,
-                                int posfix, azx_t **rchip)
-{
-        azx_t *chip;
+static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
+                                int driver_type,
+                                struct azx **rchip)
+{
+        struct azx *chip;
         int err = 0;
-        static snd_device_ops_t ops = {
-                /*.dev_free = */azx_dev_free,0,0,0
+        static struct snd_device_ops ops = {
+                .dev_free = azx_dev_free,
         };
 
         *rchip = NULL;
-
+        
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
 
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
-
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        
         if (NULL == chip) {
                 snd_printk(KERN_ERR SFX "cannot allocate chip\n");
@@ -1308 +1413 @@
         chip->pci = pci;
         chip->irq = -1;
-
-        chip->position_fix = posfix;
+        chip->driver_type = driver_type;
+
+        chip->position_fix = position_fix ? position_fix : POS_FIX_POSBUF;
+        chip->single_cmd = single_cmd;
+
+#if BITS_PER_LONG != 64
+        /* Fix up base address on ULI M5461 */
+        if (chip->driver_type == AZX_DRIVER_ULI) {
+                u16 tmp3;
+                pci_read_config_word(pci, 0x40, &tmp3);
+                pci_write_config_word(pci, 0x40, tmp3 | 0x10);
+                pci_write_config_dword(pci, PCI_BASE_ADDRESS_1, 0);
+        }
+#endif
 
         if ((err = pci_request_regions(pci, "ICH HD audio")) < 0) {
@@ -1336 +1453 @@
         synchronize_irq(chip->irq);
 
+        switch (chip->driver_type) {
+        case AZX_DRIVER_ULI:
+                chip->playback_streams = ULI_NUM_PLAYBACK;
+                chip->capture_streams = ULI_NUM_CAPTURE;
+                chip->playback_index_offset = ULI_PLAYBACK_INDEX;
+                chip->capture_index_offset = ULI_CAPTURE_INDEX;
+                break;
+        default:
+                chip->playback_streams = ICH6_NUM_PLAYBACK;
+                chip->capture_streams = ICH6_NUM_CAPTURE;
+                chip->playback_index_offset = ICH6_PLAYBACK_INDEX;
+                chip->capture_index_offset = ICH6_CAPTURE_INDEX;
+                break;
+        }
+        chip->num_streams = chip->playback_streams + chip->capture_streams;
+        chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev), GFP_KERNEL);
+        if (! chip->azx_dev) {
+                snd_printk(KERN_ERR "cannot malloc azx_dev\n");
+                goto errout;
+        }
+
         /* allocate memory for the BDL for each stream */
         if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
-                                       PAGE_SIZE, &chip->bdl)) < 0) {
+                                       BDL_SIZE, &chip->bdl)) < 0) {
                 snd_printk(KERN_ERR SFX "cannot allocate BDL\n");
                 goto errout;
-        }
-        if (chip->position_fix == POS_FIX_POSBUF) {
-            /* allocate memory for the position buffer */
-            if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
-                                           MAX_ICH6_DEV * 8, &chip->posbuf)) < 0) {
-                snd_printk(KERN_ERR SFX "cannot allocate posbuf\n");
-                goto errout;
-            }
-        }
+        }
+        /* allocate memory for the position buffer */
+        if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
+                                       chip->num_streams * 8, &chip->posbuf)) < 0) {
+                snd_printk(KERN_ERR SFX "cannot allocate posbuf\n");
+                goto errout;
+        }
         /* allocate CORB/RIRB */
-        if ((err = azx_alloc_cmd_io(chip)) < 0)
-                goto errout;
+        if (! chip->single_cmd)
+                if ((err = azx_alloc_cmd_io(chip)) < 0)
+                        goto errout;
 
         /* initialize streams */
@@ -1359 +1496 @@
         /* initialize chip */
         azx_init_chip(chip);
+
+        chip->initialized = 1;
 
         /* codec detection */
@@ -1372 +1511 @@
         }
 
+        strcpy(card->driver, "HDA-Intel");
+        strcpy(card->shortname, driver_short_names[chip->driver_type]);
+        sprintf(card->longname, "%s at 0x%lx irq %i", card->shortname, chip->addr, chip->irq);
+
         *rchip = chip;
         return 0;
@@ -1382 +1525 @@
 static int __devinit azx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
 {
-        static int dev;
-        snd_card_t *card;
-        azx_t *chip;
+        struct snd_card *card;
+        struct azx *chip;
         int err = 0;
 
-        if (dev >= SNDRV_CARDS)
-                return -ENODEV;
-        if (! enable[dev]) {
-                dev++;
-                return -ENOENT;
-        }
-
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        card = snd_card_new(index, id, THIS_MODULE, 0);
         if (NULL == card) {
                 snd_printk(KERN_ERR SFX "Error creating card!\n");
@@ -1400 +1535 @@
         }
 
-        if ((err = azx_create(card, pci, position_fix[dev], &chip)) < 0) {
+        if ((err = azx_create(card, pci, pci_id->driver_data,
+                              &chip)) < 0) {
                 snd_card_free(card);
                 return err;
         }
-
-        strcpy(card->driver, "HDA-Intel");
-        strcpy(card->shortname, "HDA Intel");
-        sprintf(card->longname, "%s at 0x%lx irq %i", card->shortname, chip->addr, chip->irq);
+        card->private_data = chip;
 
         /* create codec instances */
-        if ((err = azx_codec_create(chip, model[dev])) < 0) {
+        if ((err = azx_codec_create(chip, model)) < 0) {
                 snd_card_free(card);
                 return err;
@@ -1427 +1560 @@
         }
 
-        snd_card_set_pm_callback(card, azx_suspend, azx_resume, chip);
         snd_card_set_dev(card, &pci->dev);
 
@@ -1436 +1568 @@
 
         pci_set_drvdata(pci, card);
-        dev++;
 
         return err;
@@ -1449 +1580 @@
 /* PCI IDs */
 static struct pci_device_id azx_ids[] = {
-        { 0x8086, 0x2668, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH6 */
-        { 0x8086, 0x27d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH7 */
-        { 0x8086, 0x269a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ESB2 */
-        { 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ATI SB450 */
-        { 0x1106, 0x3288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* VIA VT8251/VT8237A */
+        { 0x8086, 0x2668, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH6 */
+        { 0x8086, 0x27d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH7 */
+        { 0x8086, 0x269a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ESB2 */
+        { 0x8086, 0x284b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH8 */
+        { 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */
+        { 0x1106, 0x3288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_VIA }, /* VIA VT8251/VT8237A */
+        { 0x1039, 0x7502, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_SIS }, /* SIS966 */
+        { 0x10b9, 0x5461, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ULI }, /* ULI M5461 */
+        { 0x10de, 0x026c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 026c */
+        { 0x10de, 0x0371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA 0371 */
         { 0, }
 };
@@ -1460 +1596 @@
 /* pci_driver definition */
 static struct pci_driver driver = {
-    0,0,0,
-        /*.name = */"HDA Intel",
-        /*.id_table = */azx_ids,
-        /*.probe = */azx_probe,
-        /*.remove = */azx_remove,
-        SND_PCI_PM_CALLBACKS
+        .name = "HDA Intel",
+        .id_table = azx_ids,
+        .probe = azx_probe,
+        .remove = __devexit_p(azx_remove),
+#ifdef CONFIG_PM
+        .suspend = azx_suspend,
+        .resume = azx_resume,
+#endif
 };
 
 static int __init alsa_card_azx_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 

GPL/trunk/alsa-kernel/pci/hda/hda_local.h

@@ -27 +27 @@
  * for mixer controls
  */
-#define HDA_COMPOSE_AMP_VAL(nid,chs,idx,dir) ((nid) | ((chs) << 16) | ((dir) << 18) | ((idx) << 19))
-
+#define HDA_COMPOSE_AMP_VAL(nid,chs,idx,dir) ((nid) | ((chs)<<16) | ((dir)<<18) | ((idx)<<19))
+/* mono volume with index (index=0,1,...) (channel=1,2) */
 #define HDA_CODEC_VOLUME_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \
-        { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, xcidx, 0,0, \
-          snd_hda_mixer_amp_volume_info, \
-          snd_hda_mixer_amp_volume_get, \
-          snd_hda_mixer_amp_volume_put, \
-          HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx,  \
+          .info = snd_hda_mixer_amp_volume_info, \
+          .get = snd_hda_mixer_amp_volume_get, \
+          .put = snd_hda_mixer_amp_volume_put, \
+          .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }
+/* stereo volume with index */
 #define HDA_CODEC_VOLUME_IDX(xname, xcidx, nid, xindex, direction) \
         HDA_CODEC_VOLUME_MONO_IDX(xname, xcidx, nid, 3, xindex, direction)
+/* mono volume */
 #define HDA_CODEC_VOLUME_MONO(xname, nid, channel, xindex, direction) \
-        HDA_CODEC_VOLUME_MONO_IDX(xname, 0, nid, 3, xindex, direction)
+        HDA_CODEC_VOLUME_MONO_IDX(xname, 0, nid, channel, xindex, direction)
+/* stereo volume */
 #define HDA_CODEC_VOLUME(xname, nid, xindex, direction) \
-    HDA_CODEC_VOLUME_MONO(xname, nid, 3, xindex, direction)
-
+        HDA_CODEC_VOLUME_MONO(xname, nid, 3, xindex, direction)
+/* mono mute switch with index (index=0,1,...) (channel=1,2) */
 #define HDA_CODEC_MUTE_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \
-    { SNDRV_CTL_ELEM_IFACE_MIXER,0,0,xname,xcidx,0,0, \
-    snd_hda_mixer_amp_switch_info, \
-    snd_hda_mixer_amp_switch_get, \
-    snd_hda_mixer_amp_switch_put, \
-    HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }
-
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \
+          .info = snd_hda_mixer_amp_switch_info, \
+          .get = snd_hda_mixer_amp_switch_get, \
+          .put = snd_hda_mixer_amp_switch_put, \
+          .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }
+/* stereo mute switch with index */
 #define HDA_CODEC_MUTE_IDX(xname, xcidx, nid, xindex, direction) \
-    HDA_CODEC_MUTE_MONO_IDX(xname, xcidx, nid, 3, xindex, direction)
-
+        HDA_CODEC_MUTE_MONO_IDX(xname, xcidx, nid, 3, xindex, direction)
+/* mono mute switch */
 #define HDA_CODEC_MUTE_MONO(xname, nid, channel, xindex, direction) \
-    HDA_CODEC_MUTE_MONO_IDX(xname, 0, nid, 3, xindex, direction)
-
+        HDA_CODEC_MUTE_MONO_IDX(xname, 0, nid, channel, xindex, direction)
+/* stereo mute switch */
 #define HDA_CODEC_MUTE(xname, nid, xindex, direction) \
-    HDA_CODEC_MUTE_MONO(xname, nid, 3, xindex, direction)
-
-int snd_hda_mixer_amp_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo);
-int snd_hda_mixer_amp_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol);
-int snd_hda_mixer_amp_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol);
-int snd_hda_mixer_amp_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo);
-int snd_hda_mixer_amp_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol);
-int snd_hda_mixer_amp_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol);
+        HDA_CODEC_MUTE_MONO(xname, nid, 3, xindex, direction)
+
+int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
+int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
+int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
+
+/* mono switch binding multiple inputs */
+#define HDA_BIND_MUTE_MONO(xname, nid, channel, indices, direction) \
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .info = snd_hda_mixer_amp_switch_info, \
+          .get = snd_hda_mixer_bind_switch_get, \
+          .put = snd_hda_mixer_bind_switch_put, \
+          .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, indices, direction) }
+
+/* stereo switch binding multiple inputs */
+#define HDA_BIND_MUTE(xname,nid,indices,dir) HDA_BIND_MUTE_MONO(xname,nid,3,indices,dir)
+
+int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
 
 int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid);
@@ -71 +88 @@
  * input MUX helper
  */
-#define HDA_MAX_NUM_INPUTS      8
+#define HDA_MAX_NUM_INPUTS      16
 struct hda_input_mux_item {
         const char *label;
@@ -81 +98 @@
 };
 
-int snd_hda_input_mux_info(const struct hda_input_mux *imux, snd_ctl_elem_info_t *uinfo);
+int snd_hda_input_mux_info(const struct hda_input_mux *imux, struct snd_ctl_elem_info *uinfo);
 int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *imux,
-                          snd_ctl_elem_value_t *ucontrol, hda_nid_t nid,
+                          struct snd_ctl_elem_value *ucontrol, hda_nid_t nid,
                           unsigned int *cur_val);
+
+/*
+ * Channel mode helper
+ */
+struct hda_channel_mode {
+        int channels;
+        const struct hda_verb *sequence;
+};
+
+int snd_hda_ch_mode_info(struct hda_codec *codec, struct snd_ctl_elem_info *uinfo,
+                         const struct hda_channel_mode *chmode, int num_chmodes);
+int snd_hda_ch_mode_get(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,
+                        const struct hda_channel_mode *chmode, int num_chmodes,
+                        int max_channels);
+int snd_hda_ch_mode_put(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,
+                        const struct hda_channel_mode *chmode, int num_chmodes,
+                        int *max_channelsp);
 
 /*
@@ -105 +139 @@
 int snd_hda_multi_out_dig_close(struct hda_codec *codec, struct hda_multi_out *mout);
 int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out *mout,
-                                  snd_pcm_substream_t *substream);
+                                  struct snd_pcm_substream *substream);
 int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_out *mout,
                                      unsigned int stream_tag,
                                      unsigned int format,
-                                     snd_pcm_substream_t *substream);
+                                     struct snd_pcm_substream *substream);
 int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, struct hda_multi_out *mout);
 
@@ -132 +166 @@
         const char *modelname;
         int config;
-        unsigned short pci_vendor;
-        unsigned short pci_device;
-};
-
-int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config *tbl);
-int snd_hda_add_new_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew);
+        unsigned short pci_subvendor;
+        unsigned short pci_subdevice;
+};
+
+int snd_hda_check_board_config(struct hda_codec *codec, const struct hda_board_config *tbl);
+int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew);
 
 /*
@@ -143 +177 @@
  */
 #ifdef CONFIG_PM
-int snd_hda_resume_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew);
+int snd_hda_resume_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew);
 int snd_hda_resume_spdif_out(struct hda_codec *codec);
 int snd_hda_resume_spdif_in(struct hda_codec *codec);
@@ -164 +198 @@
 };
 
+/*
+ * Helper for automatic ping configuration
+ */
+
+enum {
+        AUTO_PIN_MIC,
+        AUTO_PIN_FRONT_MIC,
+        AUTO_PIN_LINE,
+        AUTO_PIN_FRONT_LINE,
+        AUTO_PIN_CD,
+        AUTO_PIN_AUX,
+        AUTO_PIN_LAST
+};
+
+extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST];
+
+struct auto_pin_cfg {
+        int line_outs;
+        hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */
+        hda_nid_t speaker_pin;
+        hda_nid_t hp_pin;
+        hda_nid_t input_pins[AUTO_PIN_LAST];
+        hda_nid_t dig_out_pin;
+        hda_nid_t dig_in_pin;
+};
+
+#define get_defcfg_connect(cfg) ((cfg & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT)
+#define get_defcfg_association(cfg) ((cfg & AC_DEFCFG_DEF_ASSOC) >> AC_DEFCFG_ASSOC_SHIFT)
+#define get_defcfg_location(cfg) ((cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT)
+#define get_defcfg_sequence(cfg) (cfg & AC_DEFCFG_SEQUENCE)
+#define get_defcfg_device(cfg) ((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
+
+int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *cfg,
+                                 hda_nid_t *ignore_nids);
+
+/* amp values */
+#define AMP_IN_MUTE(idx)        (0x7080 | ((idx)<<8))
+#define AMP_IN_UNMUTE(idx)      (0x7000 | ((idx)<<8))
+#define AMP_OUT_MUTE    0xb080
+#define AMP_OUT_UNMUTE  0xb000
+#define AMP_OUT_ZERO    0xb000
+/* pinctl values */
+#define PIN_IN          0x20
+#define PIN_VREF80      0x24
+#define PIN_VREF50      0x21
+#define PIN_OUT         0x40
+#define PIN_HP          0xc0
+#define PIN_HP_AMP      0x80
+
+/*
+ * get widget capabilities
+ */
+static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid)
+{
+        if (nid < codec->start_nid ||
+            nid >= codec->start_nid + codec->num_nodes)
+                return snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP);
+        return codec->wcaps[nid - codec->start_nid];
+}
+
+
 #endif /* __SOUND_HDA_LOCAL_H */

GPL/trunk/alsa-kernel/pci/hda/hda_patch.h

@@ -11 +11 @@
 /* SigmaTel codecs */
 extern struct hda_codec_preset snd_hda_preset_sigmatel[];
+/* SiLabs 3054/3055 modem codecs */
+extern struct hda_codec_preset snd_hda_preset_si3054[];
 
 static const struct hda_codec_preset *hda_preset_tables[] = {
         snd_hda_preset_realtek,
-        snd_hda_preset_cmedia,
-        snd_hda_preset_analog,
-        snd_hda_preset_sigmatel,
+        snd_hda_preset_cmedia,
+        snd_hda_preset_analog,
+        snd_hda_preset_sigmatel,
+        snd_hda_preset_si3054,
         NULL
 };

GPL/trunk/alsa-kernel/pci/hda/hda_proc.c

@@ -27 +27 @@
 #include <sound/core.h>
 #include "hda_codec.h"
+#include "hda_local.h"
 
 static const char *get_wid_type_name(unsigned int wid_value)
 {
         static char *names[16] = {
-                /*[AC_WID_AUD_OUT] = */"Audio Output",
-                /*[AC_WID_AUD_IN] = */"Audio Input",
-                /*[AC_WID_AUD_MIX] = */"Audio Mixer",
-                /*[AC_WID_AUD_SEL] = */"Audio Selector",
-                /*[AC_WID_PIN] = */"Pin Complex",
-                /*[AC_WID_POWER] = */"Power Widget",
-                /*[AC_WID_VOL_KNB] = */"Volume Knob Widget",
-                /*[AC_WID_BEEP] = */"Beep Generator Widget",
-                0,0,0,0,0,0,0,
-                /*[AC_WID_VENDOR] = */"Vendor Defined Widget",
+                [AC_WID_AUD_OUT] = "Audio Output",
+                [AC_WID_AUD_IN] = "Audio Input",
+                [AC_WID_AUD_MIX] = "Audio Mixer",
+                [AC_WID_AUD_SEL] = "Audio Selector",
+                [AC_WID_PIN] = "Pin Complex",
+                [AC_WID_POWER] = "Power Widget",
+                [AC_WID_VOL_KNB] = "Volume Knob Widget",
+                [AC_WID_BEEP] = "Beep Generator Widget",
+                [AC_WID_VENDOR] = "Vendor Defined Widget",
         };
         wid_value &= 0xf;
@@ -49 +49 @@
 }
 
-static void print_amp_caps(snd_info_buffer_t *buffer,
+static void print_amp_caps(struct snd_info_buffer *buffer,
                            struct hda_codec *codec, hda_nid_t nid, int dir)
 {
@@ -68 +68 @@
 }
 
-static void print_amp_vals(snd_info_buffer_t *buffer,
+static void print_amp_vals(struct snd_info_buffer *buffer,
                            struct hda_codec *codec, hda_nid_t nid,
-                           int dir, int stereo)
+                           int dir, int stereo, int indices)
 {
         unsigned int val;
-        if (stereo) {
+        int i;
+
+        if (dir == HDA_OUTPUT)
+                dir = AC_AMP_GET_OUTPUT;
+        else
+                dir = AC_AMP_GET_INPUT;
+        for (i = 0; i < indices; i++) {
+                snd_iprintf(buffer, " [");
+                if (stereo) {
+                        val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE,
+                                                 AC_AMP_GET_LEFT | dir | i);
+                        snd_iprintf(buffer, "0x%02x ", val);
+                }
                 val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE,
-                                          AC_AMP_GET_LEFT |
-                                         (dir == HDA_OUTPUT ? AC_AMP_GET_OUTPUT :
-                                          AC_AMP_GET_INPUT));
-                snd_iprintf(buffer, "0x%02x ", val);
-        }
-        val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE,
-                                 AC_AMP_GET_RIGHT |
-                                 (dir == HDA_OUTPUT ? AC_AMP_GET_OUTPUT :
-                                  AC_AMP_GET_INPUT));
-        snd_iprintf(buffer, "0x%02x\n", val);
-}
-
-static void print_pcm_caps(snd_info_buffer_t *buffer,
+                                         AC_AMP_GET_RIGHT | dir | i);
+                snd_iprintf(buffer, "0x%02x]", val);
+        }
+        snd_iprintf(buffer, "\n");
+}
+
+static void print_pcm_caps(struct snd_info_buffer *buffer,
                            struct hda_codec *codec, hda_nid_t nid)
 {
@@ -156 +162 @@
 }
 
-static void print_pin_caps(snd_info_buffer_t *buffer,
+static void print_pin_caps(struct snd_info_buffer *buffer,
                            struct hda_codec *codec, hda_nid_t nid)
 {
-    static char *jack_conns[4] = { "Jack", "N/A", "Fixed", "Both" };
+        static char *jack_conns[4] = { "Jack", "N/A", "Fixed", "Both" };
         static char *jack_types[16] = {
                 "Line Out", "Speaker", "HP Out", "CD",
@@ -178 +184 @@
                 snd_iprintf(buffer, " HP");
         snd_iprintf(buffer, "\n");
-        caps = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
-        snd_iprintf(buffer, "  Pin Default 0x%08x: [%s] %s at %s %s\n", caps,
-                    jack_conns[(caps & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT],
+        caps = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+        snd_iprintf(buffer, "  Pin Default 0x%08x: [%s] %s at %s %s\n", caps,
+                    jack_conns[(caps & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT],
                     jack_types[(caps & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT],
                     jack_locations[(caps >> (AC_DEFCFG_LOCATION_SHIFT + 4)) & 3],
@@ -190 +196 @@
 
 
-static void print_codec_info(snd_info_entry_t *entry, snd_info_buffer_t *buffer)
+static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
         struct hda_codec *codec = entry->private_data;
@@ -203 +209 @@
         snd_iprintf(buffer, "Subsystem Id: 0x%x\n", codec->subsystem_id);
         snd_iprintf(buffer, "Revision Id: 0x%x\n", codec->revision_id);
+        if (! codec->afg)
+                return;
         snd_iprintf(buffer, "Default PCM: ");
         print_pcm_caps(buffer, codec, codec->afg);
@@ -219 +227 @@
                                                            AC_PAR_AUDIO_WIDGET_CAP);
                 unsigned int wid_type = (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+                int conn_len = 0; 
+                hda_nid_t conn[HDA_MAX_CONNECTIONS];
+
                 snd_iprintf(buffer, "Node 0x%02x [%s] wcaps 0x%x:", nid,
                             get_wid_type_name(wid_type), wid_caps);
@@ -233 +244 @@
                 snd_iprintf(buffer, "\n");
 
+                if (wid_caps & AC_WCAP_CONN_LIST)
+                        conn_len = snd_hda_get_connections(codec, nid, conn,
+                                                           HDA_MAX_CONNECTIONS);
+
                 if (wid_caps & AC_WCAP_IN_AMP) {
                         snd_iprintf(buffer, "  Amp-In caps: ");
@@ -238 +253 @@
                         snd_iprintf(buffer, "  Amp-In vals: ");
                         print_amp_vals(buffer, codec, nid, HDA_INPUT,
-                                       wid_caps & AC_WCAP_STEREO);
+                                       wid_caps & AC_WCAP_STEREO, conn_len);
                 }
                 if (wid_caps & AC_WCAP_OUT_AMP) {
@@ -245 +260 @@
                         snd_iprintf(buffer, "  Amp-Out vals: ");
                         print_amp_vals(buffer, codec, nid, HDA_OUTPUT,
-                                       wid_caps & AC_WCAP_STEREO);
+                                       wid_caps & AC_WCAP_STEREO, 1);
                 }
 
@@ -268 +283 @@
                 }
 
+                if (wid_caps & AC_WCAP_POWER)
+                        snd_iprintf(buffer, "  Power: 0x%x\n",
+                                    snd_hda_codec_read(codec, nid, 0,
+                                                       AC_VERB_GET_POWER_STATE, 0));
+
                 if (wid_caps & AC_WCAP_CONN_LIST) {
-                    hda_nid_t conn[HDA_MAX_CONNECTIONS];
-                    int c, conn_len, curr = -1;
-                        conn_len = snd_hda_get_connections(codec, nid, conn,
-                                                           HDA_MAX_CONNECTIONS);
-                        if (conn_len > 1 && wid_type != AC_WID_AUD_MIX)
-                            curr = snd_hda_codec_read(codec, nid, 0,
-                                                      AC_VERB_GET_CONNECT_SEL, 0);
+                        int c, curr = -1;
+                        if (conn_len > 1 && wid_type != AC_WID_AUD_MIX)
+                                curr = snd_hda_codec_read(codec, nid, 0,
+                                        AC_VERB_GET_CONNECT_SEL, 0);
                         snd_iprintf(buffer, "  Connection: %d\n", conn_len);
-                        snd_iprintf(buffer, "    ");
-                        for (c = 0; c < conn_len; c++) {
-                            snd_iprintf(buffer, " 0x%02x", conn[c]);
-                            if (c == curr)
-                                snd_iprintf(buffer, "*");
-                        }
+                        snd_iprintf(buffer, "    ");
+                        for (c = 0; c < conn_len; c++) {
+                                snd_iprintf(buffer, " 0x%02x", conn[c]);
+                                if (c == curr)
+                                        snd_iprintf(buffer, "*");
+                        }
                         snd_iprintf(buffer, "\n");
                 }
@@ -293 +310 @@
 int snd_hda_codec_proc_new(struct hda_codec *codec)
 {
-    char name[32] = {0};
-        snd_info_entry_t *entry;
+        char name[32];
+        struct snd_info_entry *entry;
         int err;
 

GPL/trunk/alsa-kernel/pci/hda/makefile.os2

@@ -15 +15 @@
 FILE1    = hda_intel.obj hda_codec.obj hda_generic.obj patch_realtek.obj 
 FILE2    = patch_cmedia.obj hda_proc.obj patch_analog.obj patch_sigmatel.obj
-FILE3    = 
+FILE3    = patch_si3054.obj
 FILE4    = 
 FILE5    = 

GPL/trunk/alsa-kernel/pci/hda/patch_analog.c

@@ -1 +1 @@
 /*
- * HD audio interface patch for AD1981HD, AD1983, AD1986A
+ * HD audio interface patch for AD1981HD, AD1983, AD1986A, AD1988
  *
  * Copyright (c) 2005 Takashi Iwai <tiwai@suse.de>
@@ -29 +29 @@
 
 struct ad198x_spec {
+        struct snd_kcontrol_new *mixers[5];
+        int num_mixers;
+
+        const struct hda_verb *init_verbs[5];   /* initialization verbs
+                                                 * don't forget NULL termination!
+                                                 */
+        unsigned int num_init_verbs;
+
+        /* playback */
+        struct hda_multi_out multiout;  /* playback set-up
+                                         * max_channels, dacs must be set
+                                         * dig_out_nid and hp_nid are optional
+                                         */
+        unsigned int cur_eapd;
+
+        /* capture */
+        unsigned int num_adc_nids;
+        hda_nid_t *adc_nids;
+        hda_nid_t dig_in_nid;           /* digital-in NID; optional */
+
+        /* capture source */
+        const struct hda_input_mux *input_mux;
+        hda_nid_t *capsrc_nids;
+        unsigned int cur_mux[3];
+
+        /* channel model */
+        const struct hda_channel_mode *channel_mode;
+        int num_channel_mode;
+
+        /* PCM information */
+        struct hda_pcm pcm_rec[2];      /* used in alc_build_pcms() */
+
         struct semaphore amp_mutex;     /* PCM volume/mute control mutex */
-        struct hda_multi_out multiout;  /* playback */
-        hda_nid_t adc_nid;
-        const struct hda_input_mux *input_mux;
-        unsigned int cur_mux;           /* capture source */
-        unsigned int spdif_route;
-        snd_kcontrol_new_t *mixers;
-        const struct hda_verb *init_verbs;
-        struct hda_pcm pcm_rec[2];      /* PCM information */
+        unsigned int spdif_route;
+
+        /* dynamic controls, init_verbs and input_mux */
+        struct auto_pin_cfg autocfg;
+        unsigned int num_kctl_alloc, num_kctl_used;
+        struct snd_kcontrol_new *kctl_alloc;
+        struct hda_input_mux private_imux;
+        hda_nid_t private_dac_nids[4];
 };
 
@@ -43 +75 @@
  * input MUX handling (common part)
  */
-static int ad198x_mux_enum_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct ad198x_spec *spec = codec->spec;
-
-    return snd_hda_input_mux_info(spec->input_mux, uinfo);
-}
-
-static int ad198x_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct ad198x_spec *spec = codec->spec;
-
-    ucontrol->value.enumerated.item[0] = spec->cur_mux;
-    return 0;
-}
-
-static int ad198x_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct ad198x_spec *spec = codec->spec;
-
-    return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
-                                 spec->adc_nid, &spec->cur_mux);
+static int ad198x_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+
+        return snd_hda_input_mux_info(spec->input_mux, uinfo);
+}
+
+static int ad198x_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+        unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+
+        ucontrol->value.enumerated.item[0] = spec->cur_mux[adc_idx];
+        return 0;
+}
+
+static int ad198x_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+        unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+
+        return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
+                                     spec->capsrc_nids[adc_idx],
+                                     &spec->cur_mux[adc_idx]);
 }
 
@@ -74 +109 @@
 static int ad198x_init(struct hda_codec *codec)
 {
-    struct ad198x_spec *spec = codec->spec;
-    snd_hda_sequence_write(codec, spec->init_verbs);
-    return 0;
+        struct ad198x_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < spec->num_init_verbs; i++)
+                snd_hda_sequence_write(codec, spec->init_verbs[i]);
+        return 0;
 }
 
 static int ad198x_build_controls(struct hda_codec *codec)
 {
-    struct ad198x_spec *spec = codec->spec;
-    int err;
-
-    err = snd_hda_add_new_ctls(codec, spec->mixers);
-    if (err < 0)
-        return err;
-    if (spec->multiout.dig_out_nid)
-        err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
-    if (err < 0)
-        return err;
-    return 0;
+        struct ad198x_spec *spec = codec->spec;
+        unsigned int i;
+        int err;
+
+        for (i = 0; i < spec->num_mixers; i++) {
+                err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
+                if (err < 0)
+                        return err;
+        }
+        if (spec->multiout.dig_out_nid) {
+                err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
+                if (err < 0)
+                        return err;
+        } 
+        if (spec->dig_in_nid) {
+                err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
+                if (err < 0)
+                        return err;
+        }
+        return 0;
 }
 
@@ -98 +145 @@
  */
 static int ad198x_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                    struct hda_codec *codec,
-                                    snd_pcm_substream_t *substream)
-{
-    struct ad198x_spec *spec = codec->spec;
-    return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
+                                    struct hda_codec *codec,
+                                    struct snd_pcm_substream *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
 }
 
 static int ad198x_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                       struct hda_codec *codec,
-                                       unsigned int stream_tag,
-                                       unsigned int format,
-                                       snd_pcm_substream_t *substream)
-{
-    struct ad198x_spec *spec = codec->spec;
-    return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
-                                            format, substream);
+                                       struct hda_codec *codec,
+                                       unsigned int stream_tag,
+                                       unsigned int format,
+                                       struct snd_pcm_substream *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
+                                                format, substream);
 }
 
 static int ad198x_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                       struct hda_codec *codec,
-                                       snd_pcm_substream_t *substream)
-{
-    struct ad198x_spec *spec = codec->spec;
-    return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
+                                       struct hda_codec *codec,
+                                       struct snd_pcm_substream *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
 }
 
@@ -128 +175 @@
  */
 static int ad198x_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        snd_pcm_substream_t *substream)
-{
-    struct ad198x_spec *spec = codec->spec;
-    return snd_hda_multi_out_dig_open(codec, &spec->multiout);
+                                        struct hda_codec *codec,
+                                        struct snd_pcm_substream *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
 }
 
 static int ad198x_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
-                                         struct hda_codec *codec,
-                                         snd_pcm_substream_t *substream)
-{
-    struct ad198x_spec *spec = codec->spec;
-    return snd_hda_multi_out_dig_close(codec, &spec->multiout);
+                                         struct hda_codec *codec,
+                                         struct snd_pcm_substream *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
 }
 
@@ -147 +194 @@
  */
 static int ad198x_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      unsigned int stream_tag,
-                                      unsigned int format,
-                                      snd_pcm_substream_t *substream)
-{
-    struct ad198x_spec *spec = codec->spec;
-    snd_hda_codec_setup_stream(codec, spec->adc_nid, stream_tag, 0, format);
-    return 0;
+                                      struct hda_codec *codec,
+                                      unsigned int stream_tag,
+                                      unsigned int format,
+                                      struct snd_pcm_substream *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
+                                   stream_tag, 0, format);
+        return 0;
 }
 
 static int ad198x_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      snd_pcm_substream_t *substream)
-{
-    struct ad198x_spec *spec = codec->spec;
-    snd_hda_codec_setup_stream(codec, spec->adc_nid, 0, 0, 0);
-    return 0;
+                                      struct hda_codec *codec,
+                                      struct snd_pcm_substream *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
+                                   0, 0, 0);
+        return 0;
 }
 
@@ -170 +219 @@
  */
 static struct hda_pcm_stream ad198x_pcm_analog_playback = {
-    /*.substreams = */1,
-    /*.channels_min = */2,
-    /*.channels_max = */6,
-    /*.nid = */0, /* fill later */
-    0,0,0,
-    /*.ops = */{
-        /*.open = */ad198x_playback_pcm_open, 0,
-        /*.prepare = */ad198x_playback_pcm_prepare,
-        /*.cleanup = */ad198x_playback_pcm_cleanup
-    },
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 6, /* changed later */
+        .nid = 0, /* fill later */
+        .ops = {
+                .open = ad198x_playback_pcm_open,
+                .prepare = ad198x_playback_pcm_prepare,
+                .cleanup = ad198x_playback_pcm_cleanup
+        },
 };
 
 static struct hda_pcm_stream ad198x_pcm_analog_capture = {
-    /*.substreams = */2,
-    /*.channels_min = */2,
-    /*.channels_max = */2,
-    /*.nid = */0, /* fill later */
-    0,0,0,
-    /*.ops = */{
-        0,0,
-        /*.prepare = */ad198x_capture_pcm_prepare,
-        /*.cleanup = */ad198x_capture_pcm_cleanup
-    },
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0, /* fill later */
+        .ops = {
+                .prepare = ad198x_capture_pcm_prepare,
+                .cleanup = ad198x_capture_pcm_cleanup
+        },
 };
 
 static struct hda_pcm_stream ad198x_pcm_digital_playback = {
-    /*.substreams = */1,
-    /*.channels_min = */2,
-    /*.channels_max = */2,
-    /*.nid = */0, /* fill later */
-    0,0,0,
-    /*.ops = */{
-        /*.open = */ad198x_dig_playback_pcm_open,
-        /*.close = */ad198x_dig_playback_pcm_close,
-        0,0
-    },
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0, /* fill later */
+        .ops = {
+                .open = ad198x_dig_playback_pcm_open,
+                .close = ad198x_dig_playback_pcm_close
+        },
+};
+
+static struct hda_pcm_stream ad198x_pcm_digital_capture = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        /* NID is set in alc_build_pcms */
 };
 
 static int ad198x_build_pcms(struct hda_codec *codec)
 {
-    struct ad198x_spec *spec = codec->spec;
-    struct hda_pcm *info = spec->pcm_rec;
-
-    codec->num_pcms = 1;
-    codec->pcm_info = info;
-
-    info->name = "AD198x Analog";
-    info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_analog_playback;
-    info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->multiout.max_channels;
-    info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
-    info->stream[SNDRV_PCM_STREAM_CAPTURE] = ad198x_pcm_analog_capture;
-    info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nid;
-
-    if (spec->multiout.dig_out_nid) {
-        info++;
-        codec->num_pcms++;
-        info->name = "AD198x Digital";
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_digital_playback;
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
-    }
-
-    return 0;
+        struct ad198x_spec *spec = codec->spec;
+        struct hda_pcm *info = spec->pcm_rec;
+
+        codec->num_pcms = 1;
+        codec->pcm_info = info;
+
+        info->name = "AD198x Analog";
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_analog_playback;
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->multiout.max_channels;
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
+        info->stream[SNDRV_PCM_STREAM_CAPTURE] = ad198x_pcm_analog_capture;
+        info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec->num_adc_nids;
+        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
+
+        if (spec->multiout.dig_out_nid) {
+                info++;
+                codec->num_pcms++;
+                info->name = "AD198x Digital";
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_digital_playback;
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
+                if (spec->dig_in_nid) {
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE] = ad198x_pcm_digital_capture;
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid;
+                }
+        }
+
+        return 0;
 }
 
 static void ad198x_free(struct hda_codec *codec)
 {
-    kfree(codec->spec);
+        struct ad198x_spec *spec = codec->spec;
+        unsigned int i;
+
+        if (spec->kctl_alloc) {
+                for (i = 0; i < spec->num_kctl_used; i++)
+                        kfree(spec->kctl_alloc[i].name);
+                kfree(spec->kctl_alloc);
+        }
+        kfree(codec->spec);
 }
 
@@ -242 +306 @@
 static int ad198x_resume(struct hda_codec *codec)
 {
-    struct ad198x_spec *spec = codec->spec;
-
-    ad198x_init(codec);
-    snd_hda_resume_ctls(codec, spec->mixers);
-    snd_hda_resume_spdif_out(codec);
-    return 0;
+        struct ad198x_spec *spec = codec->spec;
+        int i;
+
+        ad198x_init(codec);
+        for (i = 0; i < spec->num_mixers; i++)
+                snd_hda_resume_ctls(codec, spec->mixers[i]);
+        if (spec->multiout.dig_out_nid)
+                snd_hda_resume_spdif_out(codec);
+        if (spec->dig_in_nid)
+                snd_hda_resume_spdif_in(codec);
+        return 0;
 }
 #endif
 
 static struct hda_codec_ops ad198x_patch_ops = {
-    /*.build_controls = */ad198x_build_controls,
-    /*.build_pcms = */ad198x_build_pcms,
-    /*.init = */ad198x_init,
-    /*.free = */ad198x_free,0,
+        .build_controls = ad198x_build_controls,
+        .build_pcms = ad198x_build_pcms,
+        .init = ad198x_init,
+        .free = ad198x_free,
 #ifdef CONFIG_PM
-    0,
-    /*.resume = */ad198x_resume,
+        .resume = ad198x_resume,
 #endif
 };
+
 
 /*
@@ -273 +342 @@
 
 static hda_nid_t ad1986a_dac_nids[3] = {
-    AD1986A_FRONT_DAC, AD1986A_SURR_DAC, AD1986A_CLFE_DAC
-};
+        AD1986A_FRONT_DAC, AD1986A_SURR_DAC, AD1986A_CLFE_DAC
+};
+static hda_nid_t ad1986a_adc_nids[1] = { AD1986A_ADC };
 
 static struct hda_input_mux ad1986a_capture_source = {
-        /*.num_items = */7,
-        /*.items = */{
+        .num_items = 7,
+        .items = {
                 { "Mic", 0x0 },
                 { "CD", 0x1 },
@@ -297 +367 @@
 #define ad1986a_pcm_amp_vol_info        snd_hda_mixer_amp_volume_info
 
-static int ad1986a_pcm_amp_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct ad198x_spec *ad = codec->spec;
+static int ad1986a_pcm_amp_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *ad = codec->spec;
 
         down(&ad->amp_mutex);
@@ -308 +378 @@
 }
 
-static int ad1986a_pcm_amp_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct ad198x_spec *ad = codec->spec;
+static int ad1986a_pcm_amp_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *ad = codec->spec;
         int i, change = 0;
 
@@ -324 +394 @@
 }
 
-#define ad1986a_pcm_amp_sw_info         snd_hda_mixer_amp_switch_info
-
-static int ad1986a_pcm_amp_sw_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct ad198x_spec *ad = codec->spec;
+#define ad1986a_pcm_amp_sw_info         snd_hda_mixer_amp_switch_info
+
+static int ad1986a_pcm_amp_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *ad = codec->spec;
 
         down(&ad->amp_mutex);
@@ -337 +407 @@
 }
 
-static int ad1986a_pcm_amp_sw_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct ad198x_spec *ad = codec->spec;
+static int ad1986a_pcm_amp_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *ad = codec->spec;
         int i, change = 0;
 
@@ -356 +426 @@
  * mixers
  */
-static snd_kcontrol_new_t ad1986a_mixers[] = {
-    {
-        /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /*.name = */"PCM Playback Volume",0,0,0,
-        /*.info = */ad1986a_pcm_amp_vol_info,
-        /*.get = */ad1986a_pcm_amp_vol_get,
-        /*.put = */ad1986a_pcm_amp_vol_put,
-        /*.private_value = */HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT)
-    },
-    {
-        /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /*.name = */"PCM Playback Switch",0,0,0,
-        /*.info = */ad1986a_pcm_amp_sw_info,
-        /*.get = */ad1986a_pcm_amp_sw_get,
-        /*.put = */ad1986a_pcm_amp_sw_put,
-        /*.private_value = */HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT)
-    },
-    HDA_CODEC_VOLUME("Front Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Surround Playback Volume", 0x1c, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Surround Playback Switch", 0x1c, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x1d, 1, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x1d, 2, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x1d, 1, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x1d, 2, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Headphone Playback Volume", 0x1a, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Aux Playback Volume", 0x16, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Aux Playback Switch", 0x16, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x18, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x18, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Mono Playback Volume", 0x1e, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Mono Playback Switch", 0x1e, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),
-    {
-        /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /*.name = */"Capture Source",0,0,0,
-        /*.info = */ad198x_mux_enum_info,
-        /*.get = */ad198x_mux_enum_get,
-        /*.put = */ad198x_mux_enum_put,0
-    },
-    HDA_CODEC_MUTE("Stereo Downmix Switch", 0x09, 0x0, HDA_OUTPUT),
-    {0} /* end */
+static struct snd_kcontrol_new ad1986a_mixers[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "PCM Playback Volume",
+                .info = ad1986a_pcm_amp_vol_info,
+                .get = ad1986a_pcm_amp_vol_get,
+                .put = ad1986a_pcm_amp_vol_put,
+                .private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT)
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "PCM Playback Switch",
+                .info = ad1986a_pcm_amp_sw_info,
+                .get = ad1986a_pcm_amp_sw_get,
+                .put = ad1986a_pcm_amp_sw_put,
+                .private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT)
+        },
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x1c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Surround Playback Switch", 0x1c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x1d, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x1d, 2, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x1d, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x1d, 2, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x1a, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Aux Playback Volume", 0x16, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Aux Playback Switch", 0x16, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x18, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x18, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mono Playback Volume", 0x1e, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Mono Playback Switch", 0x1e, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .info = ad198x_mux_enum_info,
+                .get = ad198x_mux_enum_get,
+                .put = ad198x_mux_enum_put,
+        },
+        HDA_CODEC_MUTE("Stereo Downmix Switch", 0x09, 0x0, HDA_OUTPUT),
+        {0} /* end */
 };
 
@@ -446 +516 @@
         {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
         {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-        /* HP Pin */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
-        /* Front, Surround, CLFE Pins */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        /* Mono Pin */
-        {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        /* Mic Pin */
-        {0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
-        /* Line, Aux, CD, Beep-In Pin */
-        {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        {0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        {0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        {0} /* end */
-};
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* HP Pin */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        /* Front, Surround, CLFE Pins */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* Mono Pin */
+        {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* Mic Pin */
+        {0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        /* Line, Aux, CD, Beep-In Pin */
+        {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        {0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        {0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        {0} /* end */
+};
+
 
 static int patch_ad1986a(struct hda_codec *codec)
 {
-    struct ad198x_spec *spec;
-
-    spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
-    if (spec == NULL)
-        return -ENOMEM;
-
-    init_MUTEX(&spec->amp_mutex);
-    codec->spec = spec;
-
-    spec->multiout.max_channels = 6;
-    spec->multiout.num_dacs = ARRAY_SIZE(ad1986a_dac_nids);
-    spec->multiout.dac_nids = ad1986a_dac_nids;
-    spec->multiout.dig_out_nid = AD1986A_SPDIF_OUT;
-    spec->adc_nid = AD1986A_ADC;
-    spec->input_mux = &ad1986a_capture_source;
-    spec->mixers = ad1986a_mixers;
-    spec->init_verbs = ad1986a_init_verbs;
-
-    codec->patch_ops = ad198x_patch_ops;
-
-    return 0;
+        struct ad198x_spec *spec;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        init_MUTEX(&spec->amp_mutex);
+        codec->spec = spec;
+
+        spec->multiout.max_channels = 6;
+        spec->multiout.num_dacs = ARRAY_SIZE(ad1986a_dac_nids);
+        spec->multiout.dac_nids = ad1986a_dac_nids;
+        spec->multiout.dig_out_nid = AD1986A_SPDIF_OUT;
+        spec->num_adc_nids = 1;
+        spec->adc_nids = ad1986a_adc_nids;
+        spec->capsrc_nids = ad1986a_adc_nids;
+        spec->input_mux = &ad1986a_capture_source;
+        spec->num_mixers = 1;
+        spec->mixers[0] = ad1986a_mixers;
+        spec->num_init_verbs = 1;
+        spec->init_verbs[0] = ad1986a_init_verbs;
+
+        codec->patch_ops = ad198x_patch_ops;
+
+        return 0;
 }
 
@@ -495 +570 @@
  */
 
-#define AD1983_SPDIF_OUT        0x02
-#define AD1983_DAC              0x03
-#define AD1983_ADC              0x04
+#define AD1983_SPDIF_OUT        0x02
+#define AD1983_DAC              0x03
+#define AD1983_ADC              0x04
 
 static hda_nid_t ad1983_dac_nids[1] = { AD1983_DAC };
+static hda_nid_t ad1983_adc_nids[1] = { AD1983_ADC };
+
 static struct hda_input_mux ad1983_capture_source = {
-    /*.num_items = */4,
-    /*.items = */{
-        { "Mic", 0x0 },
-        { "Line", 0x1 },
-        { "Mix", 0x2 },
-        { "Mix Mono", 0x3 },
-    },
-};
+        .num_items = 4,
+        .items = {
+                { "Mic", 0x0 },
+                { "Line", 0x1 },
+                { "Mix", 0x2 },
+                { "Mix Mono", 0x3 },
+        },
+};
+
 /*
  * SPDIF playback route
  */
-static int ad1983_spdif_route_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{
-    static char *texts[] = { "PCM", "ADC" };
-
-    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-    uinfo->count = 1;
-    uinfo->value.enumerated.items = 2;
-    if (uinfo->value.enumerated.item > 1)
-        uinfo->value.enumerated.item = 1;
-    strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-    return 0;
-}
-
-static int ad1983_spdif_route_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct ad198x_spec *spec = codec->spec;
-
-    ucontrol->value.enumerated.item[0] = spec->spdif_route;
-    return 0;
-}
-
-static int ad1983_spdif_route_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct ad198x_spec *spec = codec->spec;
-
-    if (spec->spdif_route != ucontrol->value.enumerated.item[0]) {
-        spec->spdif_route = ucontrol->value.enumerated.item[0];
-        snd_hda_codec_write(codec, spec->multiout.dig_out_nid, 0,
-                            AC_VERB_SET_CONNECT_SEL, spec->spdif_route);
-        return 1;
-    }
-    return 0;
-}
-
-
-/*
- */
-static snd_kcontrol_new_t ad1983_mixers[] = {
+static int ad1983_spdif_route_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "PCM", "ADC" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+        if (uinfo->value.enumerated.item > 1)
+                uinfo->value.enumerated.item = 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int ad1983_spdif_route_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+
+        ucontrol->value.enumerated.item[0] = spec->spdif_route;
+        return 0;
+}
+
+static int ad1983_spdif_route_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+
+        if (spec->spdif_route != ucontrol->value.enumerated.item[0]) {
+                spec->spdif_route = ucontrol->value.enumerated.item[0];
+                snd_hda_codec_write(codec, spec->multiout.dig_out_nid, 0,
+                                    AC_VERB_SET_CONNECT_SEL, spec->spdif_route);
+                return 1;
+        }
+        return 0;
+}
+
+static struct snd_kcontrol_new ad1983_mixers[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT),
@@ -570 +645 @@
         HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-                /*.name = */"Capture Source",0,0,0,
-                /*.info = */ad198x_mux_enum_info,
-                /*.get = */ad198x_mux_enum_get,
-                /*.put = */ad198x_mux_enum_put,0
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .info = ad198x_mux_enum_info,
+                .get = ad198x_mux_enum_get,
+                .put = ad198x_mux_enum_put,
         },
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-                /*.name = */"IEC958 Playback Route",0,0,0,
-                /*.info = */ad1983_spdif_route_info,
-                /*.get = */ad1983_spdif_route_get,
-                /*.put = */ad1983_spdif_route_put,0
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route",
+                .info = ad1983_spdif_route_info,
+                .get = ad1983_spdif_route_get,
+                .put = ad1983_spdif_route_put,
         },
         {0} /* end */
@@ -625 +700 @@
 };
 
+
 static int patch_ad1983(struct hda_codec *codec)
 {
         struct ad198x_spec *spec;
 
-        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
@@ -640 +716 @@
         spec->multiout.dac_nids = ad1983_dac_nids;
         spec->multiout.dig_out_nid = AD1983_SPDIF_OUT;
-        spec->adc_nid = AD1983_ADC;
+        spec->num_adc_nids = 1;
+        spec->adc_nids = ad1983_adc_nids;
+        spec->capsrc_nids = ad1983_adc_nids;
         spec->input_mux = &ad1983_capture_source;
-        spec->mixers = ad1983_mixers;
-        spec->init_verbs = ad1983_init_verbs;
+        spec->num_mixers = 1;
+        spec->mixers[0] = ad1983_mixers;
+        spec->num_init_verbs = 1;
+        spec->init_verbs[0] = ad1983_init_verbs;
         spec->spdif_route = 0;
 
@@ -651 +731 @@
 }
 
+
 /*
  * AD1981 HD specific
  */
 
-#define AD1981_SPDIF_OUT        0x02
-#define AD1981_DAC              0x03
-#define AD1981_ADC              0x04
+#define AD1981_SPDIF_OUT        0x02
+#define AD1981_DAC              0x03
+#define AD1981_ADC              0x04
 
 static hda_nid_t ad1981_dac_nids[1] = { AD1981_DAC };
+static hda_nid_t ad1981_adc_nids[1] = { AD1981_ADC };
 
 /* 0x0c, 0x09, 0x0e, 0x0f, 0x19, 0x05, 0x18, 0x17 */
 static struct hda_input_mux ad1981_capture_source = {
-    /*.num_items = */7,
-    /*.items = */{
-        { "Front Mic", 0x0 },
-        { "Line", 0x1 },
-        { "Mix", 0x2 },
-        { "Mix Mono", 0x3 },
-        { "CD", 0x4 },
-        { "Mic", 0x6 },
-        { "Aux", 0x7 },
-    },
-};
-
-static snd_kcontrol_new_t ad1981_mixers[] = {
-    HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Headphone Playback Volume", 0x06, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Headphone Playback Switch", 0x06, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x07, 1, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x07, 1, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Line Playback Volume", 0x13, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Line Playback Switch", 0x13, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Aux Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Aux Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Mic Playback Volume", 0x1c, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Mic Playback Switch", 0x1c, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME_MONO("PC Speaker Playback Volume", 0x0d, 1, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE_MONO("PC Speaker Playback Switch", 0x0d, 1, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("Front Mic Boost", 0x08, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
-    {
-        /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /*.name = */"Capture Source",0,0,0,
-        /*.info = */ad198x_mux_enum_info,
-        /*.get = */ad198x_mux_enum_get,
-        /*.put = */ad198x_mux_enum_put,0
-    },
-    /* identical with AD1983 */
-    {
-        /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /*.name = */"IEC958 Playback Route",0,0,0,
-        /*.info = */ad1983_spdif_route_info,
-        /*.get = */ad1983_spdif_route_get,
-        /*.put = */ad1983_spdif_route_put,0
-    },
-    {0} /* end */
+        .num_items = 7,
+        .items = {
+                { "Front Mic", 0x0 },
+                { "Line", 0x1 },
+                { "Mix", 0x2 },
+                { "Mix Mono", 0x3 },
+                { "CD", 0x4 },
+                { "Mic", 0x6 },
+                { "Aux", 0x7 },
+        },
+};
+
+static struct snd_kcontrol_new ad1981_mixers[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x06, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x06, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x07, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x07, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Aux Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Aux Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x1c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x1c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("PC Speaker Playback Volume", 0x0d, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("PC Speaker Playback Switch", 0x0d, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .info = ad198x_mux_enum_info,
+                .get = ad198x_mux_enum_get,
+                .put = ad198x_mux_enum_put,
+        },
+        /* identical with AD1983 */
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route",
+                .info = ad1983_spdif_route_info,
+                .get = ad1983_spdif_route_get,
+                .put = ad1983_spdif_route_put,
+        },
+        {0} /* end */
 };
 
 static struct hda_verb ad1981_init_verbs[] = {
-    /* Front, HP, Mono; mute as default */
-    {0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x06, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    /* Beep, PCM, Front Mic, Line, Rear Mic, Aux, CD-In: mute */
-    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x11, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    /* Front, HP selectors; from Mix */
-    {0x05, AC_VERB_SET_CONNECT_SEL, 0x01},
-    {0x06, AC_VERB_SET_CONNECT_SEL, 0x01},
-    /* Mono selector; from Mix */
-    {0x0b, AC_VERB_SET_CONNECT_SEL, 0x03},
-    /* Mic Mixer; select Front Mic */
-    {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    {0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    /* Mic boost: 0dB */
-    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    /* Record selector: Front mic */
-    {0x15, AC_VERB_SET_CONNECT_SEL, 0x0},
-    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    /* SPDIF route: PCM */
-    {0x02, AC_VERB_SET_CONNECT_SEL, 0x0},
-    /* Front Pin */
-    {0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-    /* HP Pin */
-    {0x06, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
-    /* Mono Pin */
-    {0x07, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-    /* Front & Rear Mic Pins */
-    {0x08, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
-    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
-    /* Line Pin */
-    {0x09, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-    /* Digital Beep */
-    {0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},
-    /* Line-Out as Input: disabled */
-    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0} /* end */
+        /* Front, HP, Mono; mute as default */
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* Beep, PCM, Front Mic, Line, Rear Mic, Aux, CD-In: mute */
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* Front, HP selectors; from Mix */
+        {0x05, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x06, AC_VERB_SET_CONNECT_SEL, 0x01},
+        /* Mono selector; from Mix */
+        {0x0b, AC_VERB_SET_CONNECT_SEL, 0x03},
+        /* Mic Mixer; select Front Mic */
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        {0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* Mic boost: 0dB */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        /* Record selector: Front mic */
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x0},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* SPDIF route: PCM */
+        {0x02, AC_VERB_SET_CONNECT_SEL, 0x0},
+        /* Front Pin */
+        {0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* HP Pin */
+        {0x06, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        /* Mono Pin */
+        {0x07, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* Front & Rear Mic Pins */
+        {0x08, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        /* Line Pin */
+        {0x09, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        /* Digital Beep */
+        {0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* Line-Out as Input: disabled */
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0} /* end */
 };
 
 static int patch_ad1981(struct hda_codec *codec)
 {
-    struct ad198x_spec *spec;
-
-        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        struct ad198x_spec *spec;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
@@ -780 +862 @@
         spec->multiout.dac_nids = ad1981_dac_nids;
         spec->multiout.dig_out_nid = AD1981_SPDIF_OUT;
-        spec->adc_nid = AD1981_ADC;
+        spec->num_adc_nids = 1;
+        spec->adc_nids = ad1981_adc_nids;
+        spec->capsrc_nids = ad1981_adc_nids;
         spec->input_mux = &ad1981_capture_source;
-        spec->mixers = ad1981_mixers;
-        spec->init_verbs = ad1981_init_verbs;
+        spec->num_mixers = 1;
+        spec->mixers[0] = ad1981_mixers;
+        spec->num_init_verbs = 1;
+        spec->init_verbs[0] = ad1981_init_verbs;
         spec->spdif_route = 0;
 
@@ -791 +877 @@
 }
 
+
+/*
+ * AD1988
+ *
+ * Output pins and routes
+ *
+ *        Pin               Mix     Sel     DAC (*)
+ * port-A 0x11 (mute/hp) <- 0x22 <- 0x37 <- 03/04/06
+ * port-B 0x14 (mute/hp) <- 0x2b <- 0x30 <- 03/04/06
+ * port-C 0x15 (mute)    <- 0x2c <- 0x31 <- 05/0a
+ * port-D 0x12 (mute/hp) <- 0x29         <- 04
+ * port-E 0x17 (mute/hp) <- 0x26 <- 0x32 <- 05/0a
+ * port-F 0x16 (mute)    <- 0x2a         <- 06
+ * port-G 0x24 (mute)    <- 0x27         <- 05
+ * port-H 0x25 (mute)    <- 0x28         <- 0a
+ * mono   0x13 (mute/amp)<- 0x1e <- 0x36 <- 03/04/06
+ *
+ * DAC0 = 03h, DAC1 = 04h, DAC2 = 05h, DAC3 = 06h, DAC4 = 0ah
+ * (*) DAC2/3/4 are swapped to DAC3/4/2 on AD198A rev.2 due to a h/w bug.
+ *
+ * Input pins and routes
+ *
+ *        pin     boost   mix input # / adc input #
+ * port-A 0x11 -> 0x38 -> mix 2, ADC 0
+ * port-B 0x14 -> 0x39 -> mix 0, ADC 1
+ * port-C 0x15 -> 0x3a -> 33:0 - mix 1, ADC 2
+ * port-D 0x12 -> 0x3d -> mix 3, ADC 8
+ * port-E 0x17 -> 0x3c -> 34:0 - mix 4, ADC 4
+ * port-F 0x16 -> 0x3b -> mix 5, ADC 3
+ * port-G 0x24 -> N/A  -> 33:1 - mix 1, 34:1 - mix 4, ADC 6
+ * port-H 0x25 -> N/A  -> 33:2 - mix 1, 34:2 - mix 4, ADC 7
+ *
+ *
+ * DAC assignment
+ *   6stack - front/surr/CLFE/side/opt DACs - 04/06/05/0a/03
+ *   3stack - front/surr/CLFE/opt DACs - 04/05/0a/03
+ *
+ * Inputs of Analog Mix (0x20)
+ *   0:Port-B (front mic)
+ *   1:Port-C/G/H (line-in)
+ *   2:Port-A
+ *   3:Port-D (line-in/2)
+ *   4:Port-E/G/H (mic-in)
+ *   5:Port-F (mic2-in)
+ *   6:CD
+ *   7:Beep
+ *
+ * ADC selection
+ *   0:Port-A
+ *   1:Port-B (front mic-in)
+ *   2:Port-C (line-in)
+ *   3:Port-F (mic2-in)
+ *   4:Port-E (mic-in)
+ *   5:CD
+ *   6:Port-G
+ *   7:Port-H
+ *   8:Port-D (line-in/2)
+ *   9:Mix
+ *
+ * Proposed pin assignments by the datasheet
+ *
+ * 6-stack
+ * Port-A front headphone
+ *      B front mic-in
+ *      C rear line-in
+ *      D rear front-out
+ *      E rear mic-in
+ *      F rear surround
+ *      G rear CLFE
+ *      H rear side
+ *
+ * 3-stack
+ * Port-A front headphone
+ *      B front mic
+ *      C rear line-in/surround
+ *      D rear front-out
+ *      E rear mic-in/CLFE
+ *
+ * laptop
+ * Port-A headphone
+ *      B mic-in
+ *      C docking station
+ *      D internal speaker (with EAPD)
+ *      E/F quad mic array
+ */
+
+
+/* models */
+enum {
+        AD1988_6STACK,
+        AD1988_6STACK_DIG,
+        AD1988_3STACK,
+        AD1988_3STACK_DIG,
+        AD1988_LAPTOP,
+        AD1988_LAPTOP_DIG,
+        AD1988_AUTO,
+        AD1988_MODEL_LAST,
+};
+
+/* reivision id to check workarounds */
+#define AD1988A_REV2            0x100200
+
+
+/*
+ * mixers
+ */
+
+static hda_nid_t ad1988_6stack_dac_nids[4] = {
+        0x04, 0x06, 0x05, 0x0a
+};
+
+static hda_nid_t ad1988_3stack_dac_nids[3] = {
+        0x04, 0x05, 0x0a
+};
+
+/* for AD1988A revision-2, DAC2-4 are swapped */
+static hda_nid_t ad1988_6stack_dac_nids_rev2[4] = {
+        0x04, 0x05, 0x0a, 0x06
+};
+
+static hda_nid_t ad1988_3stack_dac_nids_rev2[3] = {
+        0x04, 0x0a, 0x06
+};
+
+static hda_nid_t ad1988_adc_nids[3] = {
+        0x08, 0x09, 0x0f
+};
+
+static hda_nid_t ad1988_capsrc_nids[3] = {
+        0x0c, 0x0d, 0x0e
+};
+
+#define AD1988_SPDIF_OUT        0x02
+#define AD1988_SPDIF_IN         0x07
+
+static struct hda_input_mux ad1988_6stack_capture_source = {
+        .num_items = 5,
+        .items = {
+                { "Front Mic", 0x0 },
+                { "Line", 0x1 },
+                { "Mic", 0x4 },
+                { "CD", 0x5 },
+                { "Mix", 0x9 },
+        },
+};
+
+static struct hda_input_mux ad1988_laptop_capture_source = {
+        .num_items = 3,
+        .items = {
+                { "Mic/Line", 0x0 },
+                { "CD", 0x5 },
+                { "Mix", 0x9 },
+        },
+};
+
+/*
+ */
+static int ad198x_ch_mode_info(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_info *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_ch_mode_info(codec, uinfo, spec->channel_mode,
+                                    spec->num_channel_mode);
+}
+
+static int ad198x_ch_mode_get(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_ch_mode_get(codec, ucontrol, spec->channel_mode,
+                                   spec->num_channel_mode, spec->multiout.max_channels);
+}
+
+static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode,
+                                   spec->num_channel_mode, &spec->multiout.max_channels);
+}
+
+/*
+ * EAPD control
+ */
+static int ad1988_eapd_info(struct snd_kcontrol *kcontrol,
+                            struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int ad1988_eapd_get(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+        ucontrol->value.enumerated.item[0] = ! spec->cur_eapd;
+        return 0;
+}
+
+static int ad1988_eapd_put(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+        unsigned int eapd;
+        eapd = ! ucontrol->value.enumerated.item[0];
+        if (eapd == spec->cur_eapd && ! codec->in_resume)
+                return 0;
+        spec->cur_eapd = eapd;
+        snd_hda_codec_write(codec, 0x12 /* port-D */,
+                            0, AC_VERB_SET_EAPD_BTLENABLE,
+                            eapd ? 0x02 : 0x00);
+        return 0;
+}
+
+/* 6-stack mode */
+static struct snd_kcontrol_new ad1988_6stack_mixers1[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x06, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Side Playback Volume", 0x0a, 0x0, HDA_OUTPUT),
+};
+
+static struct snd_kcontrol_new ad1988_6stack_mixers1_rev2[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x05, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0a, 2, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Side Playback Volume", 0x06, 0x0, HDA_OUTPUT),
+};
+
+static struct snd_kcontrol_new ad1988_6stack_mixers2[] = {
+        HDA_BIND_MUTE("Front Playback Switch", 0x29, 2, HDA_INPUT),
+        HDA_BIND_MUTE("Surround Playback Switch", 0x2a, 2, HDA_INPUT),
+        HDA_BIND_MUTE_MONO("Center Playback Switch", 0x27, 1, 2, HDA_INPUT),
+        HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x27, 2, 2, HDA_INPUT),
+        HDA_BIND_MUTE("Side Playback Switch", 0x28, 2, HDA_INPUT),
+        HDA_BIND_MUTE("Headphone Playback Switch", 0x22, 2, HDA_INPUT),
+        HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT),
+
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x6, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x6, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x4, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x4, HDA_INPUT),
+
+        HDA_CODEC_VOLUME("Beep Playback Volume", 0x10, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Beep Playback Switch", 0x10, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT),
+
+        {0} /* end */
+};
+
+/* 3-stack mode */
+static struct snd_kcontrol_new ad1988_3stack_mixers1[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT),
+};
+
+static struct snd_kcontrol_new ad1988_3stack_mixers1_rev2[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x06, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x06, 2, 0x0, HDA_OUTPUT),
+};
+
+static struct snd_kcontrol_new ad1988_3stack_mixers2[] = {
+        HDA_BIND_MUTE("Front Playback Switch", 0x29, 2, HDA_INPUT),
+        HDA_BIND_MUTE("Surround Playback Switch", 0x2c, 2, HDA_INPUT),
+        HDA_BIND_MUTE_MONO("Center Playback Switch", 0x26, 1, 2, HDA_INPUT),
+        HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x26, 2, 2, HDA_INPUT),
+        HDA_BIND_MUTE("Headphone Playback Switch", 0x22, 2, HDA_INPUT),
+        HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT),
+
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x6, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x6, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x4, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x4, HDA_INPUT),
+
+        HDA_CODEC_VOLUME("Beep Playback Volume", 0x10, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Beep Playback Switch", 0x10, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Channel Mode",
+                .info = ad198x_ch_mode_info,
+                .get = ad198x_ch_mode_get,
+                .put = ad198x_ch_mode_put,
+        },
+
+        {0} /* end */
+};
+
+/* laptop mode */
+static struct snd_kcontrol_new ad1988_laptop_mixers[] = {
+        HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("PCM Playback Switch", 0x29, 0x0, HDA_INPUT),
+        HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT),
+
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x6, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x6, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT),
+
+        HDA_CODEC_VOLUME("Beep Playback Volume", 0x10, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Beep Playback Switch", 0x10, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME("Mic Boost", 0x39, 0x0, HDA_OUTPUT),
+
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "External Amplifier",
+                .info = ad1988_eapd_info,
+                .get = ad1988_eapd_get,
+                .put = ad1988_eapd_put,
+        },
+
+        {0} /* end */
+};
+
+/* capture */
+static struct snd_kcontrol_new ad1988_capture_mixers[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x0e, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x0e, 0x0, HDA_OUTPUT),
+        {
+                .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 = 3,
+                .info = ad198x_mux_enum_info,
+                .get = ad198x_mux_enum_get,
+                .put = ad198x_mux_enum_put,
+        },
+        {0} /* end */
+};
+
+static int ad1988_spdif_playback_source_info(struct snd_kcontrol *kcontrol,
+                                             struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = {
+                "PCM", "ADC1", "ADC2", "ADC3"
+        };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 4;
+        if (uinfo->value.enumerated.item >= 4)
+                uinfo->value.enumerated.item = 3;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int ad1988_spdif_playback_source_get(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        unsigned int sel;
+
+        sel = snd_hda_codec_read(codec, 0x02, 0, AC_VERB_GET_CONNECT_SEL, 0);
+        if (sel > 0) {
+                sel = snd_hda_codec_read(codec, 0x0b, 0, AC_VERB_GET_CONNECT_SEL, 0);
+                if (sel <= 3)
+                        sel++;
+                else
+                        sel = 0;
+        }
+        ucontrol->value.enumerated.item[0] = sel;
+        return 0;
+}
+
+static int ad1988_spdif_playback_source_put(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        unsigned int sel;
+        int change;
+
+        sel = snd_hda_codec_read(codec, 0x02, 0, AC_VERB_GET_CONNECT_SEL, 0);
+        if (! ucontrol->value.enumerated.item[0]) {
+                change = sel != 0;
+                if (change)
+                        snd_hda_codec_write(codec, 0x02, 0, AC_VERB_SET_CONNECT_SEL, 0);
+        } else {
+                change = sel == 0;
+                if (change)
+                        snd_hda_codec_write(codec, 0x02, 0, AC_VERB_SET_CONNECT_SEL, 1);
+                sel = snd_hda_codec_read(codec, 0x0b, 0, AC_VERB_GET_CONNECT_SEL, 0) + 1;
+                change |= sel == ucontrol->value.enumerated.item[0];
+                if (change)
+                        snd_hda_codec_write(codec, 0x02, 0, AC_VERB_SET_CONNECT_SEL,
+                                            ucontrol->value.enumerated.item[0] - 1);
+        }
+        return change;
+}
+
+static struct snd_kcontrol_new ad1988_spdif_out_mixers[] = {
+        HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "IEC958 Playback Source",
+                .info = ad1988_spdif_playback_source_info,
+                .get = ad1988_spdif_playback_source_get,
+                .put = ad1988_spdif_playback_source_put,
+        },
+        {0} /* end */
+};
+
+static struct snd_kcontrol_new ad1988_spdif_in_mixers[] = {
+        HDA_CODEC_VOLUME("IEC958 Capture Volume", 0x1c, 0x0, HDA_INPUT),
+        {0} /* end */
+};
+
+
+/*
+ * initialization verbs
+ */
+
+/*
+ * for 6-stack (+dig)
+ */
+static struct hda_verb ad1988_6stack_init_verbs[] = {
+        /* Front, Surround, CLFE, side DAC; unmute as default */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Port-A front headphon path */
+        {0x37, AC_VERB_SET_CONNECT_SEL, 0x01}, /* DAC1:04h */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        /* Port-D line-out path */
+        {0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* Port-F surround path */
+        {0x2a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x2a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* Port-G CLFE path */
+        {0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* Port-H side path */
+        {0x28, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x28, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x25, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* Mono out path */
+        {0x36, AC_VERB_SET_CONNECT_SEL, 0x1}, /* DAC1:04h */
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f}, /* unmute, 0dB */
+        /* Port-B front mic-in path */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* Port-C line-in path */
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x33, AC_VERB_SET_CONNECT_SEL, 0x0},
+        /* Port-E mic-in path */
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x3c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x34, AC_VERB_SET_CONNECT_SEL, 0x0},
+
+        {0}
+};
+
+static struct hda_verb ad1988_capture_init_verbs[] = {
+        /* mute analog mix */
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
+        /* select ADCs - front-mic */
+        {0x0c, AC_VERB_SET_CONNECT_SEL, 0x1},
+        {0x0d, AC_VERB_SET_CONNECT_SEL, 0x1},
+        {0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},
+        /* ADCs; muted */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+
+        {0}
+};
+
+static struct hda_verb ad1988_spdif_init_verbs[] = {
+        /* SPDIF out sel */
+        {0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, /* PCM */
+        {0x0b, AC_VERB_SET_CONNECT_SEL, 0x0}, /* ADC1 */
+        {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        /* SPDIF out pin */
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x17}, /* 0dB */
+
+        {0}
+};
+
+/*
+ * verbs for 3stack (+dig)
+ */
+static struct hda_verb ad1988_3stack_ch2_init[] = {
+        /* set port-C to line-in */
+        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+        { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
+        /* set port-E to mic-in */
+        { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+        { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
+        {0} /* end */
+};
+
+static struct hda_verb ad1988_3stack_ch6_init[] = {
+        /* set port-C to surround out */
+        { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        /* set port-E to CLFE out */
+        { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        {0} /* end */
+};
+
+static struct hda_channel_mode ad1988_3stack_modes[2] = {
+        { 2, ad1988_3stack_ch2_init },
+        { 6, ad1988_3stack_ch6_init },
+};
+
+static struct hda_verb ad1988_3stack_init_verbs[] = {
+        /* Front, Surround, CLFE, side DAC; unmute as default */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Port-A front headphon path */
+        {0x37, AC_VERB_SET_CONNECT_SEL, 0x01}, /* DAC1:04h */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        /* Port-D line-out path */
+        {0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* Mono out path */
+        {0x36, AC_VERB_SET_CONNECT_SEL, 0x1}, /* DAC1:04h */
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f}, /* unmute, 0dB */
+        /* Port-B front mic-in path */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* Port-C line-in/surround path - 6ch mode as default */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x31, AC_VERB_SET_CONNECT_SEL, 0x0}, /* output sel: DAC 0x05 */
+        {0x33, AC_VERB_SET_CONNECT_SEL, 0x0},
+        /* Port-E mic-in/CLFE path - 6ch mode as default */
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x3c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x32, AC_VERB_SET_CONNECT_SEL, 0x1}, /* output sel: DAC 0x0a */
+        {0x34, AC_VERB_SET_CONNECT_SEL, 0x0},
+        /* mute analog mix */
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
+        /* select ADCs - front-mic */
+        {0x0c, AC_VERB_SET_CONNECT_SEL, 0x1},
+        {0x0d, AC_VERB_SET_CONNECT_SEL, 0x1},
+        {0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},
+        /* ADCs; muted */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0}
+};
+
+/*
+ * verbs for laptop mode (+dig)
+ */
+static struct hda_verb ad1988_laptop_hp_on[] = {
+        /* unmute port-A and mute port-D */
+        { 0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        { 0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+        {0} /* end */
+};
+static struct hda_verb ad1988_laptop_hp_off[] = {
+        /* mute port-A and unmute port-D */
+        { 0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+        { 0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        {0} /* end */
+};
+
+#define AD1988_HP_EVENT 0x01
+
+static struct hda_verb ad1988_laptop_init_verbs[] = {
+        /* Front, Surround, CLFE, side DAC; unmute as default */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Port-A front headphon path */
+        {0x37, AC_VERB_SET_CONNECT_SEL, 0x01}, /* DAC1:04h */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        /* unsolicited event for pin-sense */
+        {0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1988_HP_EVENT },
+        /* Port-D line-out path + EAPD */
+        {0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x12, AC_VERB_SET_EAPD_BTLENABLE, 0x00}, /* EAPD-off */
+        /* Mono out path */
+        {0x36, AC_VERB_SET_CONNECT_SEL, 0x1}, /* DAC1:04h */
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f}, /* unmute, 0dB */
+        /* Port-B mic-in path */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* Port-C docking station - try to output */
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x33, AC_VERB_SET_CONNECT_SEL, 0x0},
+        /* mute analog mix */
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
+        /* select ADCs - mic */
+        {0x0c, AC_VERB_SET_CONNECT_SEL, 0x1},
+        {0x0d, AC_VERB_SET_CONNECT_SEL, 0x1},
+        {0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},
+        /* ADCs; muted */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0}
+};
+
+static void ad1988_laptop_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        if ((res >> 26) != AD1988_HP_EVENT)
+                return;
+        if (snd_hda_codec_read(codec, 0x11, 0, AC_VERB_GET_PIN_SENSE, 0) & (1 << 31))
+                snd_hda_sequence_write(codec, ad1988_laptop_hp_on);
+        else
+                snd_hda_sequence_write(codec, ad1988_laptop_hp_off);
+} 
+
+
+/*
+ * Automatic parse of I/O pins from the BIOS configuration
+ */
+
+#define NUM_CONTROL_ALLOC       32
+#define NUM_VERB_ALLOC          32
+
+enum {
+        AD_CTL_WIDGET_VOL,
+        AD_CTL_WIDGET_MUTE,
+        AD_CTL_BIND_MUTE,
+};
+static struct snd_kcontrol_new ad1988_control_templates[] = {
+        HDA_CODEC_VOLUME(NULL, 0, 0, 0),
+        HDA_CODEC_MUTE(NULL, 0, 0, 0),
+        HDA_BIND_MUTE(NULL, 0, 0, 0),
+};
+
+/* add dynamic controls */
+static int add_control(struct ad198x_spec *spec, int type, const char *name,
+                       unsigned long val)
+{
+        struct snd_kcontrol_new *knew;
+
+        if (spec->num_kctl_used >= spec->num_kctl_alloc) {
+                int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC;
+
+                knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */
+                if (! knew)
+                        return -ENOMEM;
+                if (spec->kctl_alloc) {
+                        memcpy(knew, spec->kctl_alloc, sizeof(*knew) * spec->num_kctl_alloc);
+                        kfree(spec->kctl_alloc);
+                }
+                spec->kctl_alloc = knew;
+                spec->num_kctl_alloc = num;
+        }
+
+        knew = &spec->kctl_alloc[spec->num_kctl_used];
+        *knew = ad1988_control_templates[type];
+        knew->name = kstrdup(name, GFP_KERNEL);
+        if (! knew->name)
+                return -ENOMEM;
+        knew->private_value = val;
+        spec->num_kctl_used++;
+        return 0;
+}
+
+#define AD1988_PIN_CD_NID               0x18
+#define AD1988_PIN_BEEP_NID             0x10
+
+static hda_nid_t ad1988_mixer_nids[8] = {
+        /* A     B     C     D     E     F     G     H */
+        0x22, 0x2b, 0x2c, 0x29, 0x26, 0x2a, 0x27, 0x28
+};
+
+static inline hda_nid_t ad1988_idx_to_dac(struct hda_codec *codec, int idx)
+{
+        static hda_nid_t idx_to_dac[8] = {
+                /* A     B     C     D     E     F     G     H */
+                0x04, 0x06, 0x05, 0x04, 0x0a, 0x06, 0x05, 0x0a
+        };
+        static hda_nid_t idx_to_dac_rev2[8] = {
+                /* A     B     C     D     E     F     G     H */
+                0x04, 0x05, 0x0a, 0x04, 0x06, 0x05, 0x0a, 0x06
+        };
+        if (codec->revision_id == AD1988A_REV2)
+                return idx_to_dac_rev2[idx];
+        else
+                return idx_to_dac[idx];
+}
+
+static hda_nid_t ad1988_boost_nids[8] = {
+        0x38, 0x39, 0x3a, 0x3d, 0x3c, 0x3b, 0, 0
+};
+
+static int ad1988_pin_idx(hda_nid_t nid)
+{
+        static hda_nid_t ad1988_io_pins[8] = {
+                0x11, 0x14, 0x15, 0x12, 0x17, 0x16, 0x24, 0x25
+        };
+        int i;
+        for (i = 0; i < ARRAY_SIZE(ad1988_io_pins); i++)
+                if (ad1988_io_pins[i] == nid)
+                        return i;
+        return 0; /* should be -1 */
+}
+
+static int ad1988_pin_to_loopback_idx(hda_nid_t nid)
+{
+        static int loopback_idx[8] = {
+                2, 0, 1, 3, 4, 5, 1, 4
+        };
+        switch (nid) {
+        case AD1988_PIN_CD_NID:
+                return 6;
+        default:
+                return loopback_idx[ad1988_pin_idx(nid)];
+        }
+}
+
+static int ad1988_pin_to_adc_idx(hda_nid_t nid)
+{
+        static int adc_idx[8] = {
+                0, 1, 2, 8, 4, 3, 6, 7
+        };
+        switch (nid) {
+        case AD1988_PIN_CD_NID:
+                return 5;
+        default:
+                return adc_idx[ad1988_pin_idx(nid)];
+        }
+}
+
+/* fill in the dac_nids table from the parsed pin configuration */
+static int ad1988_auto_fill_dac_nids(struct hda_codec *codec,
+                                     const struct auto_pin_cfg *cfg)
+{
+        struct ad198x_spec *spec = codec->spec;
+        int i, idx;
+
+        spec->multiout.dac_nids = spec->private_dac_nids;
+
+        /* check the pins hardwired to audio widget */
+        for (i = 0; i < cfg->line_outs; i++) {
+                idx = ad1988_pin_idx(cfg->line_out_pins[i]);
+                spec->multiout.dac_nids[i] = ad1988_idx_to_dac(codec, idx);
+        }
+        spec->multiout.num_dacs = cfg->line_outs;
+        return 0;
+}
+
+/* add playback controls from the parsed DAC table */
+static int ad1988_auto_create_multi_out_ctls(struct ad198x_spec *spec,
+                                             const struct auto_pin_cfg *cfg)
+{
+        char name[32];
+        static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };
+        hda_nid_t nid;
+        int i, err;
+
+        for (i = 0; i < cfg->line_outs; i++) {
+                hda_nid_t dac = spec->multiout.dac_nids[i];
+                if (! dac)
+                        continue;
+                nid = ad1988_mixer_nids[ad1988_pin_idx(cfg->line_out_pins[i])];
+                if (i == 2) {
+                        /* Center/LFE */
+                        err = add_control(spec, AD_CTL_WIDGET_VOL,
+                                          "Center Playback Volume",
+                                          HDA_COMPOSE_AMP_VAL(dac, 1, 0, HDA_OUTPUT));
+                        if (err < 0)
+                                return err;
+                        err = add_control(spec, AD_CTL_WIDGET_VOL,
+                                          "LFE Playback Volume",
+                                          HDA_COMPOSE_AMP_VAL(dac, 2, 0, HDA_OUTPUT));
+                        if (err < 0)
+                                return err;
+                        err = add_control(spec, AD_CTL_BIND_MUTE,
+                                          "Center Playback Switch",
+                                          HDA_COMPOSE_AMP_VAL(nid, 1, 2, HDA_INPUT));
+                        if (err < 0)
+                                return err;
+                        err = add_control(spec, AD_CTL_BIND_MUTE,
+                                          "LFE Playback Switch",
+                                          HDA_COMPOSE_AMP_VAL(nid, 2, 2, HDA_INPUT));
+                        if (err < 0)
+                                return err;
+                } else {
+                        sprintf(name, "%s Playback Volume", chname[i]);
+                        err = add_control(spec, AD_CTL_WIDGET_VOL, name,
+                                          HDA_COMPOSE_AMP_VAL(dac, 3, 0, HDA_OUTPUT));
+                        if (err < 0)
+                                return err;
+                        sprintf(name, "%s Playback Switch", chname[i]);
+                        err = add_control(spec, AD_CTL_BIND_MUTE, name,
+                                          HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT));
+                        if (err < 0)
+                                return err;
+                }
+        }
+        return 0;
+}
+
+/* add playback controls for speaker and HP outputs */
+static int ad1988_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
+                                        const char *pfx)
+{
+        struct ad198x_spec *spec = codec->spec;
+        hda_nid_t nid;
+        int idx, err;
+        char name[32];
+
+        if (! pin)
+                return 0;
+
+        idx = ad1988_pin_idx(pin);
+        nid = ad1988_idx_to_dac(codec, idx);
+        if (! spec->multiout.dac_nids[0]) {
+                /* use this as the primary output */
+                spec->multiout.dac_nids[0] = nid;
+                if (! spec->multiout.num_dacs)
+                        spec->multiout.num_dacs = 1;
+        } else 
+                /* specify the DAC as the extra output */
+                spec->multiout.hp_nid = nid;
+        /* control HP volume/switch on the output mixer amp */
+        sprintf(name, "%s Playback Volume", pfx);
+        if ((err = add_control(spec, AD_CTL_WIDGET_VOL, name,
+                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                return err;
+        nid = ad1988_mixer_nids[idx];
+        sprintf(name, "%s Playback Switch", pfx);
+        if ((err = add_control(spec, AD_CTL_BIND_MUTE, name,
+                               HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0)
+                return err;
+        return 0;
+}
+
+/* create input playback/capture controls for the given pin */
+static int new_analog_input(struct ad198x_spec *spec, hda_nid_t pin,
+                            const char *ctlname, int boost)
+{
+        char name[32];
+        int err, idx;
+
+        sprintf(name, "%s Playback Volume", ctlname);
+        idx = ad1988_pin_to_loopback_idx(pin);
+        if ((err = add_control(spec, AD_CTL_WIDGET_VOL, name,
+                               HDA_COMPOSE_AMP_VAL(0x20, 3, idx, HDA_INPUT))) < 0)
+                return err;
+        sprintf(name, "%s Playback Switch", ctlname);
+        if ((err = add_control(spec, AD_CTL_WIDGET_MUTE, name,
+                               HDA_COMPOSE_AMP_VAL(0x20, 3, idx, HDA_INPUT))) < 0)
+                return err;
+        if (boost) {
+                hda_nid_t bnid;
+                idx = ad1988_pin_idx(pin);
+                bnid = ad1988_boost_nids[idx];
+                if (bnid) {
+                        sprintf(name, "%s Boost", ctlname);
+                        return add_control(spec, AD_CTL_WIDGET_VOL, name,
+                                           HDA_COMPOSE_AMP_VAL(bnid, 3, idx, HDA_OUTPUT));
+
+                }
+        }
+        return 0;
+}
+
+/* create playback/capture controls for input pins */
+static int ad1988_auto_create_analog_input_ctls(struct ad198x_spec *spec,
+                                                const struct auto_pin_cfg *cfg)
+{
+        struct hda_input_mux *imux = &spec->private_imux;
+        int i, err;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                err = new_analog_input(spec, cfg->input_pins[i],
+                                       auto_pin_cfg_labels[i],
+                                       i <= AUTO_PIN_FRONT_MIC);
+                if (err < 0)
+                        return err;
+                imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
+                imux->items[imux->num_items].index = ad1988_pin_to_adc_idx(cfg->input_pins[i]);
+                imux->num_items++;
+        }
+        imux->items[imux->num_items].label = "Mix";
+        imux->items[imux->num_items].index = 9;
+        imux->num_items++;
+
+        if ((err = add_control(spec, AD_CTL_WIDGET_VOL,
+                               "Analog Mix Playback Volume",
+                               HDA_COMPOSE_AMP_VAL(0x21, 3, 0x0, HDA_OUTPUT))) < 0)
+                return err;
+        if ((err = add_control(spec, AD_CTL_WIDGET_MUTE,
+                               "Analog Mix Playback Switch",
+                               HDA_COMPOSE_AMP_VAL(0x21, 3, 0x0, HDA_OUTPUT))) < 0)
+                return err;
+
+        return 0;
+}
+
+static void ad1988_auto_set_output_and_unmute(struct hda_codec *codec,
+                                              hda_nid_t nid, int pin_type,
+                                              int dac_idx)
+{
+        /* set as output */
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+        switch (nid) {
+        case 0x11: /* port-A - DAC 04 */
+                snd_hda_codec_write(codec, 0x37, 0, AC_VERB_SET_CONNECT_SEL, 0x01);
+                break;
+        case 0x14: /* port-B - DAC 06 */
+                snd_hda_codec_write(codec, 0x30, 0, AC_VERB_SET_CONNECT_SEL, 0x02);
+                break;
+        case 0x15: /* port-C - DAC 05 */
+                snd_hda_codec_write(codec, 0x31, 0, AC_VERB_SET_CONNECT_SEL, 0x00);
+                break;
+        case 0x17: /* port-E - DAC 0a */
+                snd_hda_codec_write(codec, 0x32, 0, AC_VERB_SET_CONNECT_SEL, 0x01);
+                break;
+        case 0x13: /* mono - DAC 04 */
+                snd_hda_codec_write(codec, 0x36, 0, AC_VERB_SET_CONNECT_SEL, 0x01);
+                break;
+        }
+}
+
+static void ad1988_auto_init_multi_out(struct hda_codec *codec)
+{
+        struct ad198x_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < spec->autocfg.line_outs; i++) {
+                hda_nid_t nid = spec->autocfg.line_out_pins[i];
+                ad1988_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
+        }
+}
+
+static void ad1988_auto_init_extra_out(struct hda_codec *codec)
+{
+        struct ad198x_spec *spec = codec->spec;
+        hda_nid_t pin;
+
+        pin = spec->autocfg.speaker_pin;
+        if (pin) /* connect to front */
+                ad1988_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
+        pin = spec->autocfg.hp_pin;
+        if (pin) /* connect to front */
+                ad1988_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
+}
+
+static void ad1988_auto_init_analog_input(struct hda_codec *codec)
+{
+        struct ad198x_spec *spec = codec->spec;
+        int i, idx;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                hda_nid_t nid = spec->autocfg.input_pins[i];
+                if (! nid)
+                        continue;
+                switch (nid) {
+                case 0x15: /* port-C */
+                        snd_hda_codec_write(codec, 0x33, 0, AC_VERB_SET_CONNECT_SEL, 0x0);
+                        break;
+                case 0x17: /* port-E */
+                        snd_hda_codec_write(codec, 0x34, 0, AC_VERB_SET_CONNECT_SEL, 0x0);
+                        break;
+                }
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                    i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+                if (nid != AD1988_PIN_CD_NID)
+                        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                            AMP_OUT_MUTE);
+                idx = ad1988_pin_idx(nid);
+                if (ad1988_boost_nids[idx])
+                        snd_hda_codec_write(codec, ad1988_boost_nids[idx], 0,
+                                            AC_VERB_SET_AMP_GAIN_MUTE,
+                                            AMP_OUT_ZERO);
+        }
+}
+
+/* parse the BIOS configuration and set up the alc_spec */
+/* return 1 if successful, 0 if the proper config is not found, or a negative error code */
+static int ad1988_parse_auto_config(struct hda_codec *codec)
+{
+        struct ad198x_spec *spec = codec->spec;
+        int err;
+
+        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL)) < 0)
+                return err;
+        if ((err = ad1988_auto_fill_dac_nids(codec, &spec->autocfg)) < 0)
+                return err;
+        if (! spec->autocfg.line_outs && ! spec->autocfg.speaker_pin &&
+            ! spec->autocfg.hp_pin)
+                return 0; /* can't find valid BIOS pin config */
+        if ((err = ad1988_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+            (err = ad1988_auto_create_extra_out(codec, spec->autocfg.speaker_pin,
+                                                "Speaker")) < 0 ||
+            (err = ad1988_auto_create_extra_out(codec, spec->autocfg.speaker_pin,
+                                                "Headphone")) < 0 ||
+            (err = ad1988_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+                return err;
+
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+        if (spec->autocfg.dig_out_pin)
+                spec->multiout.dig_out_nid = AD1988_SPDIF_OUT;
+        if (spec->autocfg.dig_in_pin)
+                spec->dig_in_nid = AD1988_SPDIF_IN;
+
+        if (spec->kctl_alloc)
+                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+        spec->init_verbs[spec->num_init_verbs++] = ad1988_6stack_init_verbs;
+
+        spec->input_mux = &spec->private_imux;
+
+        return 1;
+}
+
+/* init callback for auto-configuration model -- overriding the default init */
+static int ad1988_auto_init(struct hda_codec *codec)
+{
+        ad198x_init(codec);
+        ad1988_auto_init_multi_out(codec);
+        ad1988_auto_init_extra_out(codec);
+        ad1988_auto_init_analog_input(codec);
+        return 0;
+}
+
+
+/*
+ */
+
+static struct hda_board_config ad1988_cfg_tbl[] = {
+        { .modelname = "6stack",        .config = AD1988_6STACK },
+        { .modelname = "6stack-dig",    .config = AD1988_6STACK_DIG },
+        { .modelname = "3stack",        .config = AD1988_3STACK },
+        { .modelname = "3stack-dig",    .config = AD1988_3STACK_DIG },
+        { .modelname = "laptop",        .config = AD1988_LAPTOP },
+        { .modelname = "laptop-dig",    .config = AD1988_LAPTOP_DIG },
+        { .modelname = "auto",          .config = AD1988_AUTO },
+        {0}
+};
+
+static int patch_ad1988(struct hda_codec *codec)
+{
+        struct ad198x_spec *spec;
+        int board_config;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        init_MUTEX(&spec->amp_mutex);
+        codec->spec = spec;
+
+        if (codec->revision_id == AD1988A_REV2)
+                snd_printk(KERN_INFO "patch_analog: AD1988A rev.2 is detected, enable workarounds\n");
+
+        board_config = snd_hda_check_board_config(codec, ad1988_cfg_tbl);
+        if (board_config < 0 || board_config >= AD1988_MODEL_LAST) {
+                printk(KERN_INFO "hda_codec: Unknown model for AD1988, trying auto-probe from BIOS...\n");
+                board_config = AD1988_AUTO;
+        }
+
+        if (board_config == AD1988_AUTO) {
+                /* automatic parse from the BIOS config */
+                int err = ad1988_parse_auto_config(codec);
+                if (err < 0) {
+                        ad198x_free(codec);
+                        return err;
+                } else if (! err) {
+                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using 6-stack mode...\n");
+                        board_config = AD1988_6STACK;
+                }
+        }
+
+        switch (board_config) {
+        case AD1988_6STACK:
+        case AD1988_6STACK_DIG:
+                spec->multiout.max_channels = 8;
+                spec->multiout.num_dacs = 4;
+                if (codec->revision_id == AD1988A_REV2)
+                        spec->multiout.dac_nids = ad1988_6stack_dac_nids_rev2;
+                else
+                        spec->multiout.dac_nids = ad1988_6stack_dac_nids;
+                spec->input_mux = &ad1988_6stack_capture_source;
+                spec->num_mixers = 2;
+                if (codec->revision_id == AD1988A_REV2)
+                        spec->mixers[0] = ad1988_6stack_mixers1_rev2;
+                else
+                        spec->mixers[0] = ad1988_6stack_mixers1;
+                spec->mixers[1] = ad1988_6stack_mixers2;
+                spec->num_init_verbs = 1;
+                spec->init_verbs[0] = ad1988_6stack_init_verbs;
+                if (board_config == AD1988_6STACK_DIG) {
+                        spec->multiout.dig_out_nid = AD1988_SPDIF_OUT;
+                        spec->dig_in_nid = AD1988_SPDIF_IN;
+                }
+                break;
+        case AD1988_3STACK:
+        case AD1988_3STACK_DIG:
+                spec->multiout.max_channels = 6;
+                spec->multiout.num_dacs = 3;
+                if (codec->revision_id == AD1988A_REV2)
+                        spec->multiout.dac_nids = ad1988_3stack_dac_nids_rev2;
+                else
+                        spec->multiout.dac_nids = ad1988_3stack_dac_nids;
+                spec->input_mux = &ad1988_6stack_capture_source;
+                spec->channel_mode = ad1988_3stack_modes;
+                spec->num_channel_mode = ARRAY_SIZE(ad1988_3stack_modes);
+                spec->num_mixers = 2;
+                if (codec->revision_id == AD1988A_REV2)
+                        spec->mixers[0] = ad1988_3stack_mixers1_rev2;
+                else
+                        spec->mixers[0] = ad1988_3stack_mixers1;
+                spec->mixers[1] = ad1988_3stack_mixers2;
+                spec->num_init_verbs = 1;
+                spec->init_verbs[0] = ad1988_3stack_init_verbs;
+                if (board_config == AD1988_3STACK_DIG)
+                        spec->multiout.dig_out_nid = AD1988_SPDIF_OUT;
+                break;
+        case AD1988_LAPTOP:
+        case AD1988_LAPTOP_DIG:
+                spec->multiout.max_channels = 2;
+                spec->multiout.num_dacs = 1;
+                spec->multiout.dac_nids = ad1988_3stack_dac_nids;
+                spec->input_mux = &ad1988_laptop_capture_source;
+                spec->num_mixers = 1;
+                spec->mixers[0] = ad1988_laptop_mixers;
+                spec->num_init_verbs = 1;
+                spec->init_verbs[0] = ad1988_laptop_init_verbs;
+                if (board_config == AD1988_LAPTOP_DIG)
+                        spec->multiout.dig_out_nid = AD1988_SPDIF_OUT;
+                break;
+        }
+
+        spec->num_adc_nids = ARRAY_SIZE(ad1988_adc_nids);
+        spec->adc_nids = ad1988_adc_nids;
+        spec->capsrc_nids = ad1988_capsrc_nids;
+        spec->mixers[spec->num_mixers++] = ad1988_capture_mixers;
+        spec->init_verbs[spec->num_init_verbs++] = ad1988_capture_init_verbs;
+        if (spec->multiout.dig_out_nid) {
+                spec->mixers[spec->num_mixers++] = ad1988_spdif_out_mixers;
+                spec->init_verbs[spec->num_init_verbs++] = ad1988_spdif_init_verbs;
+        }
+        if (spec->dig_in_nid)
+                spec->mixers[spec->num_mixers++] = ad1988_spdif_in_mixers;
+
+        codec->patch_ops = ad198x_patch_ops;
+        switch (board_config) {
+        case AD1988_AUTO:
+                codec->patch_ops.init = ad1988_auto_init;
+                break;
+        case AD1988_LAPTOP:
+        case AD1988_LAPTOP_DIG:
+                codec->patch_ops.unsol_event = ad1988_laptop_unsol_event;
+                break;
+        }
+
+        return 0;
+}
+
+
 /*
  * patch entries
  */
 struct hda_codec_preset snd_hda_preset_analog[] = {
-    { /*.id = */0x11d41981, 0, 0, 0, 0,/*.name = */"AD1981", /*.patch = */patch_ad1981 },
-    { /*.id = */0x11d41983, 0, 0, 0, 0,/*.name = */"AD1983", /*.patch = */patch_ad1983 },
-    { /*.id = */0x11d41986, 0, 0, 0, 0,/*.name = */"AD1986A", /*.patch = */patch_ad1986a },
-    {0} /* terminator */
-};
+        { .id = 0x11d41981, .name = "AD1981", .patch = patch_ad1981 },
+        { .id = 0x11d41983, .name = "AD1983", .patch = patch_ad1983 },
+        { .id = 0x11d41986, .name = "AD1986A", .patch = patch_ad1986a },
+        { .id = 0x11d41988, .name = "AD1988", .patch = patch_ad1988 },
+        {0} /* terminator */
+};

GPL/trunk/alsa-kernel/pci/hda/patch_cmedia.c

@@ -30 +30 @@
 #include "hda_codec.h"
 #include "hda_local.h"
-
-#define NUM_PINS        11
+#define NUM_PINS        11
+
 
 /* board config type */
@@ -39 +39 @@
         CMI_FULL,       /* back 6-jack + front-panel 2-jack */
         CMI_FULL_DIG,   /* back 6-jack + front-panel 2-jack + digital I/O */
-        CMI_ALLOUT,     /* back 5-jack + front-panel 2-jack + digital out */
-        CMI_AUTO,       /* let driver guess it */
+        CMI_ALLOUT,     /* back 5-jack + front-panel 2-jack + digital out */
+        CMI_AUTO,       /* let driver guess it */
 };
 
 struct cmi_spec {
         int board_config;
-        unsigned int surr_switch: 1;    /* switchable line,mic */
         unsigned int no_line_in: 1;     /* no line-in (5-jack) */
         unsigned int front_panel: 1;    /* has front-panel 2-jack */
 
         /* playback */
-        struct hda_multi_out multiout;
-        hda_nid_t dac_nids[4];          /* NID for each DAC */
+        struct hda_multi_out multiout;
+        hda_nid_t dac_nids[4];          /* NID for each DAC */
+        int num_dacs;
 
         /* capture */
@@ -62 +62 @@
 
         /* channel mode */
-        unsigned int num_ch_modes;
-        unsigned int cur_ch_mode;
-        const struct cmi_channel_mode *channel_modes;
-
-        struct hda_pcm pcm_rec[2];      /* PCM information */
-
-        /* pin deafault configuration */
-        hda_nid_t pin_nid[NUM_PINS];
-        unsigned int def_conf[NUM_PINS];
-        unsigned int pin_def_confs;
-
-        /* multichannel pins */
-        hda_nid_t multich_pin[4];       /* max 8-channel */
-        struct hda_verb multi_init[9];  /* 2 verbs for each pin + terminator */
+        int num_channel_modes;
+        const struct hda_channel_mode *channel_modes;
+
+        struct hda_pcm pcm_rec[2];      /* PCM information */
+
+        /* pin deafault configuration */
+        hda_nid_t pin_nid[NUM_PINS];
+        unsigned int def_conf[NUM_PINS];
+        unsigned int pin_def_confs;
+
+        /* multichannel pins */
+        hda_nid_t multich_pin[4];       /* max 8-channel */
+        struct hda_verb multi_init[9];  /* 2 verbs for each pin + terminator */
 };
 
@@ -81 +80 @@
  * input MUX
  */
-static int cmi_mux_enum_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int cmi_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -88 +87 @@
 }
 
-static int cmi_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int cmi_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -98 +97 @@
 }
 
-static int cmi_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int cmi_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -115 +114 @@
 static struct hda_verb cmi9880_ch2_init[] = {
         /* set line-in PIN for input */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         /* set mic PIN for input, also enable vref */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         /* route front PCM (DAC1) to HP */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
@@ -125 +124 @@
 /* 3-stack / 6 channel */
 static struct hda_verb cmi9880_ch6_init[] = {
-    /* set line-in PIN for output */
-    { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-    /* set mic PIN for output */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* set line-in PIN for output */
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        /* set mic PIN for output */
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         /* route front PCM (DAC1) to HP */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
@@ -136 +135 @@
 /* 3-stack+front / 8 channel */
 static struct hda_verb cmi9880_ch8_init[] = {
-    /* set line-in PIN for output */
-    { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-    /* set mic PIN for output */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* set line-in PIN for output */
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        /* set mic PIN for output */
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         /* route rear-surround PCM (DAC4) to HP */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x03 },
@@ -145 +144 @@
 };
 
-struct cmi_channel_mode {
-        unsigned int channels;
-        const struct hda_verb *sequence;
-};
-
-static struct cmi_channel_mode cmi9880_channel_modes[3] = {
+static struct hda_channel_mode cmi9880_channel_modes[3] = {
         { 2, cmi9880_ch2_init },
         { 6, cmi9880_ch6_init },
@@ -156 +150 @@
 };
 
-static int cmi_ch_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int cmi_ch_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct cmi_spec *spec = codec->spec;
-
-        snd_assert(spec->channel_modes, return -EINVAL);
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = spec->num_ch_modes;
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
-        sprintf(uinfo->value.enumerated.name, "%dch",
-                spec->channel_modes[uinfo->value.enumerated.item].channels);
-        return 0;
-}
-
-static int cmi_ch_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+        return snd_hda_ch_mode_info(codec, uinfo, spec->channel_modes,
+                                    spec->num_channel_modes);
+}
+
+static int cmi_ch_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct cmi_spec *spec = codec->spec;
-
-        ucontrol->value.enumerated.item[0] = spec->cur_ch_mode;
-        return 0;
-}
-
-static int cmi_ch_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+        return snd_hda_ch_mode_get(codec, ucontrol, spec->channel_modes,
+                                   spec->num_channel_modes, spec->multiout.max_channels);
+}
+
+static int cmi_ch_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct cmi_spec *spec = codec->spec;
-
-        snd_assert(spec->channel_modes, return -EINVAL);
-        if (ucontrol->value.enumerated.item[0] >= spec->num_ch_modes)
-                ucontrol->value.enumerated.item[0] = spec->num_ch_modes;
-        if (ucontrol->value.enumerated.item[0] == spec->cur_ch_mode &&
-            ! codec->in_resume)
-                return 0;
-
-        spec->cur_ch_mode = ucontrol->value.enumerated.item[0];
-        snd_hda_sequence_write(codec, spec->channel_modes[spec->cur_ch_mode].sequence);
-        spec->multiout.max_channels = spec->channel_modes[spec->cur_ch_mode].channels;
-        return 1;
-}
-
-/*
- */
-static snd_kcontrol_new_t cmi9880_basic_mixer[] = {
+        return snd_hda_ch_mode_put(codec, ucontrol, spec->channel_modes,
+                                   spec->num_channel_modes, &spec->multiout.max_channels);
+}
+
+/*
+ */
+static struct snd_kcontrol_new cmi9880_basic_mixer[] = {
         /* CMI9880 has no playback volumes! */
         HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), /* front */
@@ -209 +184 @@
         HDA_CODEC_MUTE("Side Playback Switch", 0x06, 0x0, HDA_OUTPUT),
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 /* The multiple "Capture Source" controls confuse alsamixer
                  * So call somewhat different..
@@ -215 +190 @@
                  */
                 /* .name = "Capture Source", */
-                /*.name = */"Input Source",0,0,
-                /*.count = */2,
-                /*.info = */cmi_mux_enum_info,
-                /*.get = */cmi_mux_enum_get,
-                /*.put = */cmi_mux_enum_put,0
+                .name = "Input Source",
+                .count = 2,
+                .info = cmi_mux_enum_info,
+                .get = cmi_mux_enum_get,
+                .put = cmi_mux_enum_put,
         },
         HDA_CODEC_VOLUME("Capture Volume", 0x08, 0, HDA_INPUT),
@@ -233 +208 @@
  * shared I/O pins
  */
-static snd_kcontrol_new_t cmi9880_ch_mode_mixer[] = {
+static struct snd_kcontrol_new cmi9880_ch_mode_mixer[] = {
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-                /*.name = */"Channel Mode",0,0,0,
-                /*.info = */cmi_ch_mode_info,
-                /*.get = */cmi_ch_mode_get,
-                /*.put = */cmi_ch_mode_put,
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Channel Mode",
+                .info = cmi_ch_mode_info,
+                .get = cmi_ch_mode_get,
+                .put = cmi_ch_mode_put,
         },
         {0} /* end */
@@ -248 +223 @@
  */
 static struct hda_input_mux cmi9880_basic_mux = {
-        /*.num_items = */4,
-        /*.items = */{
+        .num_items = 4,
+        .items = {
                 { "Front Mic", 0x5 },
                 { "Rear Mic", 0x2 },
@@ -258 +233 @@
 
 static struct hda_input_mux cmi9880_no_line_mux = {
-        /*.num_items = */3,
-        /*.items = */{
+        .num_items = 3,
+        .items = {
                 { "Front Mic", 0x5 },
                 { "Rear Mic", 0x2 },
@@ -282 +257 @@
 static struct hda_verb cmi9880_basic_init[] = {
         /* port-D for line out (rear panel) */
-        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-E for HP out (front panel) */
-        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* route front PCM to HP */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
         /* port-A for surround (rear panel) */
-        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-G for CLFE (rear panel) */
-        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
-        { 0x1f, AC_VERB_SET_CONNECT_SEL, 0x02 },
+        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+        { 0x1f, AC_VERB_SET_CONNECT_SEL, 0x02 },
         /* port-H for side (rear panel) */
-        { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
-        { 0x20, AC_VERB_SET_CONNECT_SEL, 0x01 },
+        { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+        { 0x20, AC_VERB_SET_CONNECT_SEL, 0x01 },
         /* port-C for line-in (rear panel) */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         /* port-B for mic-in (rear panel) with vref */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         /* port-F for mic-in (front panel) with vref */
-        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         /* CD-in */
-        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         /* route front mic to ADC1/2 */
         { 0x08, AC_VERB_SET_CONNECT_SEL, 0x05 },
@@ -311 +286 @@
 static struct hda_verb cmi9880_allout_init[] = {
         /* port-D for line out (rear panel) */
-        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-E for HP out (front panel) */
-        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* route front PCM to HP */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
         /* port-A for side (rear panel) */
-        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-G for CLFE (rear panel) */
-        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
-        { 0x1f, AC_VERB_SET_CONNECT_SEL, 0x02 },
-                 /* port-H for side (rear panel) */
-                 { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
-                 { 0x20, AC_VERB_SET_CONNECT_SEL, 0x01 },
+        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+        { 0x1f, AC_VERB_SET_CONNECT_SEL, 0x02 },
+        /* port-H for side (rear panel) */
+        { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+        { 0x20, AC_VERB_SET_CONNECT_SEL, 0x01 },
         /* port-C for surround (rear panel) */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-B for mic-in (rear panel) with vref */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         /* port-F for mic-in (front panel) with vref */
-        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         /* CD-in */
-        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         /* route front mic to ADC1/2 */
         { 0x08, AC_VERB_SET_CONNECT_SEL, 0x05 },
@@ -348 +323 @@
         if (err < 0)
                 return err;
-        if (spec->surr_switch) {
+        if (spec->channel_modes) {
                 err = snd_hda_add_new_ctls(codec, cmi9880_ch_mode_mixer);
                 if (err < 0)
                         return err;
         }
-        if (spec->multiout.dig_out_nid) {
-            err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
-            if (err < 0)
-                return err;
-        }
-        if (spec->dig_in_nid) {
-            err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
-            if (err < 0)
-                return err;
-        }
-        return 0;
-}
-
-#define get_defcfg_connect(cfg) ((cfg & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT)
-#define get_defcfg_association(cfg) ((cfg & AC_DEFCFG_DEF_ASSOC) >> AC_DEFCFG_ASSOC_SHIFT)
-#define get_defcfg_sequence(cfg) (cfg & AC_DEFCFG_SEQUENCE)
-
-/* get all pin default configuration in def_conf */
-static int cmi9880_get_pin_def_config(struct hda_codec *codec)
-{
-    struct cmi_spec *spec = codec->spec;
-    hda_nid_t nid, nid_start;
-    int i = 0, nodes;
-
-    nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid_start);
-    for (nid = nid_start; nid < nodes + nid_start; nid++) {
-        unsigned int wid_caps = snd_hda_param_read(codec, nid,
-                                                   AC_PAR_AUDIO_WIDGET_CAP);
-        unsigned int wid_type = (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
-        /* read all default configuration for pin complex */
-        if (wid_type == AC_WID_PIN) {
-            spec->pin_nid[i] = nid;
-            spec->def_conf[i] =
-                snd_hda_codec_read(codec, nid, 0,
-                                   AC_VERB_GET_CONFIG_DEFAULT, 0);
-            i++;
-        }
-    }
-    spec->pin_def_confs = i;
-    return 0;
-}
-
-/* get a pin default configuration of nid in def_conf */
-static unsigned int cmi9880_get_def_config(struct hda_codec *codec, hda_nid_t nid)
-{
-    struct cmi_spec *spec = codec->spec;
-    int i = 0;
-
-    while (spec->pin_nid[i] != nid && i < spec->pin_def_confs)
-        i++;
-    if (i == spec->pin_def_confs)
-        return (unsigned int) -1;
-    else
-        return spec->def_conf[i];
-}
-
-/* decide what pins to use for multichannel playback */
-static int cmi9880_get_multich_pins(struct hda_codec *codec)
-{
-    struct cmi_spec *spec = codec->spec;
-    int i, j, pins, seq[4];
-    int max_channel = 0;
-    unsigned int def_conf, sequence;
-    hda_nid_t nid;
-
-    memset(spec->multich_pin, 0, sizeof(spec->multich_pin));
-    for (pins = 0, i = 0; i < spec->pin_def_confs && pins < 4; i++) {
-        def_conf = spec->def_conf[i];
-        /* skip pin not connected */
-        if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)
-            continue;
-        /* get the sequence if association == 1 */
-        /* the other pins have association = 0, incorrect in spec 1.0 */
-        if (get_defcfg_association(def_conf) == 1) {
-            sequence = get_defcfg_sequence(def_conf);
-            seq[pins] = sequence;
-            spec->multich_pin[pins] = spec->pin_nid[i];
-            pins++; // ready for next slot
-            max_channel += 2;
-        }
-    }
-    /* sort by sequence, data collected here will be for Windows */
-    for (i = 0; i < pins; i++) {
-        for (j = i + 1; j < pins; j++) {
-            if (seq[j] < seq[i]) {
-                sequence = seq[j];
-                nid = spec->multich_pin[j];
-                seq[j] = seq[i];
-                spec->multich_pin[j] = spec->multich_pin[i];
-                seq[i] = sequence;
-                spec->multich_pin[i] = nid;
-            }
-        }
-    }
-    /* the pin assignment is for front, C/LFE, surround and back */
-    if (max_channel >= 6) {
-        hda_nid_t temp;
-        /* exchange pin of C/LFE and surround */
-        temp = spec->multich_pin[1];
-        spec->multich_pin[1] = spec->multich_pin[2];
-        spec->multich_pin[2] = temp;
-    }
-    return max_channel;
+        if (spec->multiout.dig_out_nid) {
+                err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
+                if (err < 0)
+                        return err;
+        }
+        if (spec->dig_in_nid) {
+                err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
+                if (err < 0)
+                        return err;
+        }
+        return 0;
 }
 
 /* fill in the multi_dac_nids table, which will decide
- which audio widget to use for each channel */
-static int cmi9880_fill_multi_dac_nids(struct hda_codec *codec)
-{
-    struct cmi_spec *spec = codec->spec;
-    hda_nid_t nid;
-    int assigned[4];
-    int i, j;
-
-    /* clear the table, only one c-media dac assumed here */
-    memset(spec->dac_nids, 0, sizeof(spec->dac_nids));
-    memset(assigned, 0, sizeof(assigned));
-    /* check the pins we found */
-    for (i = 0; i < spec->multiout.max_channels / 2; i++) {
-        nid = spec->multich_pin[i];
-        /* nid 0x0b~0x0e is hardwired to audio widget 0x3~0x6 */
-        if (nid <= 0x0e && nid >= 0x0b) {
-            spec->dac_nids[i] = nid - 0x08;
-            assigned[nid - 0x0b] = 1;
-        }
-    }
-    /* left pin can be connect to any audio widget */
-    for (i = 0; i < spec->multiout.max_channels / 2; i++) {
-        if (!assigned[i]) {
-            /* search for an empty channel */
-            /* I should also check the pin type */
-            for (j = 0; j < ARRAY_SIZE(spec->dac_nids); j++)
-                if (! spec->dac_nids[j]) {
-                    spec->dac_nids[j] = i + 3;
-                    assigned[i] = 1;
-                    break;
-                }
-        }
-    }
-    return 0;
+   which audio widget to use for each channel */
+static int cmi9880_fill_multi_dac_nids(struct hda_codec *codec, const struct auto_pin_cfg *cfg)
+{
+        struct cmi_spec *spec = codec->spec;
+        hda_nid_t nid;
+        int assigned[4];
+        int i, j;
+
+        /* clear the table, only one c-media dac assumed here */
+        memset(spec->dac_nids, 0, sizeof(spec->dac_nids));
+        memset(assigned, 0, sizeof(assigned));
+        /* check the pins we found */
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = cfg->line_out_pins[i];
+                /* nid 0x0b~0x0e is hardwired to audio widget 0x3~0x6 */
+                if (nid >= 0x0b && nid <= 0x0e) {
+                        spec->dac_nids[i] = (nid - 0x0b) + 0x03;
+                        assigned[nid - 0x0b] = 1;
+                }
+        }
+        /* left pin can be connect to any audio widget */
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = cfg->line_out_pins[i];
+                if (nid <= 0x0e)
+                        continue;
+                /* search for an empty channel */
+                for (j = 0; j < cfg->line_outs; j++) {
+                        if (! assigned[j]) {
+                                spec->dac_nids[i] = j + 0x03;
+                                assigned[j] = 1;
+                                break;
+                        }
+                }
+        }
+        spec->num_dacs = cfg->line_outs;
+        return 0;
 }
 
 /* create multi_init table, which is used for multichannel initialization */
-static int cmi9880_fill_multi_init(struct hda_codec *codec)
-{
-    struct cmi_spec *spec = codec->spec;
-    hda_nid_t nid;
-    int i, j, k, len;
-
-    /* clear the table, only one c-media dac assumed here */
-    memset(spec->multi_init, 0, sizeof(spec->multi_init));
-    for (j = 0, i = 0; i < spec->multiout.max_channels / 2; i++) {
-        hda_nid_t conn[4];
-        nid = spec->multich_pin[i];
-        /* set as output */
-        spec->multi_init[j].nid = nid;
-        spec->multi_init[j].verb = AC_VERB_SET_PIN_WIDGET_CONTROL;
-        spec->multi_init[j].param = 0xc0;
-        j++;
-        /* nid 0x0f,0x10,0x1f,0x20 are needed to set connection */
-        switch (nid) {
-        case 0x0f:
-        case 0x10:
-        case 0x1f:
-        case 0x20:
-            /* set connection */
-            spec->multi_init[j].nid = nid;
-            spec->multi_init[j].verb = AC_VERB_SET_CONNECT_SEL;
-            /* find the index in connect list */
-            len = snd_hda_get_connections(codec, nid, conn, 4);
-            for (k = 0; k < len; k++)
-                if (conn[k] == spec->dac_nids[i])
-                    break;
-            spec->multi_init[j].param = k < len ? k : 0;
-            j++;
-            break;
-        }
-    }
-    return 0;
+static int cmi9880_fill_multi_init(struct hda_codec *codec, const struct auto_pin_cfg *cfg)
+{
+        struct cmi_spec *spec = codec->spec;
+        hda_nid_t nid;
+        int i, j, k, len;
+
+        /* clear the table, only one c-media dac assumed here */
+        memset(spec->multi_init, 0, sizeof(spec->multi_init));
+        for (j = 0, i = 0; i < cfg->line_outs; i++) {
+                hda_nid_t conn[4];
+                nid = cfg->line_out_pins[i];
+                /* set as output */
+                spec->multi_init[j].nid = nid;
+                spec->multi_init[j].verb = AC_VERB_SET_PIN_WIDGET_CONTROL;
+                spec->multi_init[j].param = PIN_OUT;
+                j++;
+                if (nid > 0x0e) {
+                        /* set connection */
+                        spec->multi_init[j].nid = nid;
+                        spec->multi_init[j].verb = AC_VERB_SET_CONNECT_SEL;
+                        spec->multi_init[j].param = 0;
+                        /* find the index in connect list */
+                        len = snd_hda_get_connections(codec, nid, conn, 4);
+                        for (k = 0; k < len; k++)
+                                if (conn[k] == spec->dac_nids[i]) {
+                                        spec->multi_init[j].param = k;
+                                        break;
+                                }
+                        j++;
+                }
+        }
+        return 0;
 }
 
@@ -540 +421 @@
                 snd_hda_sequence_write(codec, cmi9880_allout_init);
         else
-            snd_hda_sequence_write(codec, cmi9880_basic_init);
-        if (spec->board_config == CMI_AUTO)
-            snd_hda_sequence_write(codec, spec->multi_init);
+                snd_hda_sequence_write(codec, cmi9880_basic_init);
+        if (spec->board_config == CMI_AUTO)
+                snd_hda_sequence_write(codec, spec->multi_init);
         return 0;
 }
@@ -556 +437 @@
         cmi9880_init(codec);
         snd_hda_resume_ctls(codec, cmi9880_basic_mixer);
-        if (spec->surr_switch)
+        if (spec->channel_modes)
                 snd_hda_resume_ctls(codec, cmi9880_ch_mode_mixer);
         if (spec->multiout.dig_out_nid)
-            snd_hda_resume_spdif_out(codec);
-        if (spec->dig_in_nid)
-            snd_hda_resume_spdif_in(codec);
+                snd_hda_resume_spdif_out(codec);
+        if (spec->dig_in_nid)
+                snd_hda_resume_spdif_in(codec);
 
         return 0;
@@ -572 +453 @@
 static int cmi9880_playback_pcm_open(struct hda_pcm_stream *hinfo,
                                      struct hda_codec *codec,
-                                     snd_pcm_substream_t *substream)
+                                     struct snd_pcm_substream *substream)
 {
         struct cmi_spec *spec = codec->spec;
@@ -582 +463 @@
                                         unsigned int stream_tag,
                                         unsigned int format,
-                                        snd_pcm_substream_t *substream)
+                                        struct snd_pcm_substream *substream)
 {
         struct cmi_spec *spec = codec->spec;
@@ -591 +472 @@
 static int cmi9880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
                                        struct hda_codec *codec,
-                                       snd_pcm_substream_t *substream)
+                                       struct snd_pcm_substream *substream)
 {
         struct cmi_spec *spec = codec->spec;
@@ -602 +483 @@
 static int cmi9880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
                                          struct hda_codec *codec,
-                                         snd_pcm_substream_t *substream)
+                                         struct snd_pcm_substream *substream)
 {
         struct cmi_spec *spec = codec->spec;
@@ -610 +491 @@
 static int cmi9880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
                                           struct hda_codec *codec,
-                                          snd_pcm_substream_t *substream)
+                                          struct snd_pcm_substream *substream)
 {
         struct cmi_spec *spec = codec->spec;
@@ -623 +504 @@
                                       unsigned int stream_tag,
                                       unsigned int format,
-                                      snd_pcm_substream_t *substream)
+                                      struct snd_pcm_substream *substream)
 {
         struct cmi_spec *spec = codec->spec;
@@ -634 +515 @@
 static int cmi9880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
                                       struct hda_codec *codec,
-                                      snd_pcm_substream_t *substream)
+                                      struct snd_pcm_substream *substream)
 {
         struct cmi_spec *spec = codec->spec;
@@ -646 +527 @@
  */
 static struct hda_pcm_stream cmi9880_pcm_analog_playback = {
-        /*.substreams = */1,
-        /*.channels_min = */2,
-        /*.channels_max = */8,
-        /*.nid = */0x03, /* NID to query formats and rates */
-        0,0,0,
-        /*.ops = */{
-                /*.open = */cmi9880_playback_pcm_open,0,
-                /*.prepare = */cmi9880_playback_pcm_prepare,
-                /*.cleanup = */cmi9880_playback_pcm_cleanup
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 8,
+        .nid = 0x03, /* NID to query formats and rates */
+        .ops = {
+                .open = cmi9880_playback_pcm_open,
+                .prepare = cmi9880_playback_pcm_prepare,
+                .cleanup = cmi9880_playback_pcm_cleanup
         },
 };
 
 static struct hda_pcm_stream cmi9880_pcm_analog_capture = {
-        /*.substreams = */2,
-        /*.channels_min = */2,
-        /*.channels_max = */2,
-        /*.nid = */0x08, /* NID to query formats and rates */
-        0,0,0,
-        /*.ops = */{
-            0,0,
-                /*.prepare = */cmi9880_capture_pcm_prepare,
-                /*.cleanup = */cmi9880_capture_pcm_cleanup
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0x08, /* NID to query formats and rates */
+        .ops = {
+                .prepare = cmi9880_capture_pcm_prepare,
+                .cleanup = cmi9880_capture_pcm_cleanup
         },
 };
 
 static struct hda_pcm_stream cmi9880_pcm_digital_playback = {
-        /*.substreams = */1,
-        /*.channels_min = */2,
-        /*.channels_max = */2,
-        /* NID is set in cmi9880_build_pcms */
-        0,0,0,0,
-        /*.ops = */{
-                /*.open = */cmi9880_dig_playback_pcm_open,
-                /*.close = */cmi9880_dig_playback_pcm_close,0,0
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        /* NID is set in cmi9880_build_pcms */
+        .ops = {
+                .open = cmi9880_dig_playback_pcm_open,
+                .close = cmi9880_dig_playback_pcm_close
         },
 };
 
 static struct hda_pcm_stream cmi9880_pcm_digital_capture = {
-        /*.substreams = */1,
-        /*.channels_min = */2,
-        /*.channels_max = */2,
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
         /* NID is set in cmi9880_build_pcms */
 };
@@ -728 +605 @@
 
 static struct hda_board_config cmi9880_cfg_tbl[] = {
-        { "minimal", CMI_MINIMAL, 0, 0 },
-        { "min_fp",  CMI_MIN_FP, 0, 0 },
-        { "full",    CMI_FULL, 0, 0 },
-        { "full_dig",CMI_FULL_DIG, 0, 0 },
-        { "allout",  CMI_ALLOUT, 0, 0 },
-        { "auto",    CMI_AUTO, 0, 0 },
+        { .modelname = "minimal", .config = CMI_MINIMAL },
+        { .modelname = "min_fp", .config = CMI_MIN_FP },
+        { .modelname = "full", .config = CMI_FULL },
+        { .modelname = "full_dig", .config = CMI_FULL_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x813d, .config = CMI_FULL_DIG }, /* ASUS P5AD2 */
+        { .modelname = "allout", .config = CMI_ALLOUT },
+        { .modelname = "auto", .config = CMI_AUTO },
         {0} /* terminator */
 };
 
 static struct hda_codec_ops cmi9880_patch_ops = {
-        /*.build_controls = */cmi9880_build_controls,
-        /*.build_pcms = */cmi9880_build_pcms,
-        /*.init = */cmi9880_init,
-        /*.free = */cmi9880_free,0,
+        .build_controls = cmi9880_build_controls,
+        .build_pcms = cmi9880_build_pcms,
+        .init = cmi9880_init,
+        .free = cmi9880_free,
 #ifdef CONFIG_PM
-        0,
-        /*.resume = */cmi9880_resume,
+        .resume = cmi9880_resume,
 #endif
 };
@@ -752 +629 @@
         struct cmi_spec *spec;
 
-        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
@@ -759 +636 @@
         spec->board_config = snd_hda_check_board_config(codec, cmi9880_cfg_tbl);
         if (spec->board_config < 0) {
-            snd_printd(KERN_INFO "hda_codec: Unknown model for CMI9880\n");
-            spec->board_config = CMI_AUTO; /* try everything */
-        }
-
-        /* copy default DAC NIDs */
-        memcpy(spec->dac_nids, cmi9880_dac_nids, sizeof(spec->dac_nids));
+                snd_printdd(KERN_INFO "hda_codec: Unknown model for CMI9880\n");
+                spec->board_config = CMI_AUTO; /* try everything */
+        }
+
+        /* copy default DAC NIDs */
+        memcpy(spec->dac_nids, cmi9880_dac_nids, sizeof(spec->dac_nids));
+        spec->num_dacs = 4;
 
         switch (spec->board_config) {
         case CMI_MINIMAL:
         case CMI_MIN_FP:
-                spec->surr_switch = 1;
+                spec->channel_modes = cmi9880_channel_modes;
                 if (spec->board_config == CMI_MINIMAL)
-                        spec->num_ch_modes = 2;
+                        spec->num_channel_modes = 2;
                 else {
                         spec->front_panel = 1;
-                        spec->num_ch_modes = 3;
-                }
-                spec->channel_modes = cmi9880_channel_modes;
+                        spec->num_channel_modes = 3;
+                }
                 spec->multiout.max_channels = cmi9880_channel_modes[0].channels;
                 spec->input_mux = &cmi9880_basic_mux;
@@ -796 +673 @@
                 spec->input_mux = &cmi9880_no_line_mux;
                 spec->multiout.dig_out_nid = CMI_DIG_OUT_NID;
-                break;
-        case CMI_AUTO:
-            {
-                unsigned int port_e, port_f, port_g, port_h;
-                unsigned int port_spdifi, port_spdifo;
-                int max_channels;
-                /* collect pin default configuration */
-                cmi9880_get_pin_def_config(codec);
-                port_e = cmi9880_get_def_config(codec, 0x0f);
-                port_f = cmi9880_get_def_config(codec, 0x10);
-                port_g = cmi9880_get_def_config(codec, 0x1f);
-                port_h = cmi9880_get_def_config(codec, 0x20);
-                port_spdifi = cmi9880_get_def_config(codec, 0x13);
-                port_spdifo = cmi9880_get_def_config(codec, 0x12);
-                spec->front_panel = 1;
-                if (get_defcfg_connect(port_e) == AC_JACK_PORT_NONE ||
-                    get_defcfg_connect(port_f) == AC_JACK_PORT_NONE) {
-                    spec->surr_switch = 1;
-                    /* no front panel */
-                    if (get_defcfg_connect(port_g) == AC_JACK_PORT_NONE ||
-                        get_defcfg_connect(port_h) == AC_JACK_PORT_NONE) {
-                        /* no optional rear panel */
-                        spec->board_config = CMI_MINIMAL;
-                        spec->front_panel = 0;
-                        spec->num_ch_modes = 2;
-                    } else {
-                        spec->board_config = CMI_MIN_FP;
-                        spec->num_ch_modes = 3;
-                    }
-                    spec->channel_modes = cmi9880_channel_modes;
-                    spec->input_mux = &cmi9880_basic_mux;
-                    spec->multiout.max_channels = cmi9880_channel_modes[0].channels;
-                } else {
-                    spec->input_mux = &cmi9880_basic_mux;
-                    if (get_defcfg_connect(port_spdifo) != AC_JACK_PORT_NONE)
-                        spec->multiout.dig_out_nid = CMI_DIG_OUT_NID;
-                    if (get_defcfg_connect(port_spdifi) != AC_JACK_PORT_NONE)
-                        spec->dig_in_nid = CMI_DIG_IN_NID;
-                    spec->multiout.max_channels = 8;
-                }
-                max_channels = cmi9880_get_multich_pins(codec);
-                if (max_channels > 0) {
-                    spec->multiout.max_channels = max_channels;
-                    cmi9880_fill_multi_dac_nids(codec);
-                    cmi9880_fill_multi_init(codec);
-                } else
-                    snd_printd("patch_cmedia: cannot detect association in defcfg\n");
-            break;
-            }
-        }
-
-        spec->multiout.num_dacs = 4;
-        spec->multiout.dac_nids = spec->dac_nids;
+                break;
+        case CMI_AUTO:
+                {
+                unsigned int port_e, port_f, port_g, port_h;
+                unsigned int port_spdifi, port_spdifo;
+                struct auto_pin_cfg cfg;
+
+                /* collect pin default configuration */
+                port_e = snd_hda_codec_read(codec, 0x0f, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                port_f = snd_hda_codec_read(codec, 0x10, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                spec->front_panel = 1;
+                if (get_defcfg_connect(port_e) == AC_JACK_PORT_NONE ||
+                    get_defcfg_connect(port_f) == AC_JACK_PORT_NONE) {
+                        port_g = snd_hda_codec_read(codec, 0x1f, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        port_h = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        spec->channel_modes = cmi9880_channel_modes;
+                        /* no front panel */
+                        if (get_defcfg_connect(port_g) == AC_JACK_PORT_NONE ||
+                            get_defcfg_connect(port_h) == AC_JACK_PORT_NONE) {
+                                /* no optional rear panel */
+                                spec->board_config = CMI_MINIMAL;
+                                spec->front_panel = 0;
+                                spec->num_channel_modes = 2;
+                        } else {
+                                spec->board_config = CMI_MIN_FP;
+                                spec->num_channel_modes = 3;
+                        }
+                        spec->input_mux = &cmi9880_basic_mux;
+                        spec->multiout.max_channels = cmi9880_channel_modes[0].channels;
+                } else {
+                        spec->input_mux = &cmi9880_basic_mux;
+                        port_spdifi = snd_hda_codec_read(codec, 0x13, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        port_spdifo = snd_hda_codec_read(codec, 0x12, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        if (get_defcfg_connect(port_spdifo) != AC_JACK_PORT_NONE)
+                                spec->multiout.dig_out_nid = CMI_DIG_OUT_NID;
+                        if (get_defcfg_connect(port_spdifi) != AC_JACK_PORT_NONE)
+                                spec->dig_in_nid = CMI_DIG_IN_NID;
+                        spec->multiout.max_channels = 8;
+                }
+                snd_hda_parse_pin_def_config(codec, &cfg, NULL);
+                if (cfg.line_outs) {
+                        spec->multiout.max_channels = cfg.line_outs * 2;
+                        cmi9880_fill_multi_dac_nids(codec, &cfg);
+                        cmi9880_fill_multi_init(codec, &cfg);
+                } else
+                        snd_printd("patch_cmedia: cannot detect association in defcfg\n");
+                break;
+                }
+        }
+
+        spec->multiout.num_dacs = spec->num_dacs;
+        spec->multiout.dac_nids = spec->dac_nids;
 
         spec->adc_nids = cmi9880_adc_nids;
@@ -861 +737 @@
  */
 struct hda_codec_preset snd_hda_preset_cmedia[] = {
-    { 0x13f69880, 0,0,0,0,"CMI9880", patch_cmi9880 },
-    { 0x434d4980, 0,0,0,0,"CMI9880", patch_cmi9880 },
-    {0} /* terminator */
-};
+        { .id = 0x13f69880, .name = "CMI9880", .patch = patch_cmi9880 },
+        { .id = 0x434d4980, .name = "CMI9880", .patch = patch_cmi9880 },
+        {0} /* terminator */
+};

GPL/trunk/alsa-kernel/pci/hda/patch_realtek.c

@@ -4 +4 @@
  * HD audio interface patch for ALC 260/880/882 codecs
  *
- * Copyright (c) 2004 PeiSen Hou <pshou@realtek.com.tw>
+ * Copyright (c) 2004 Kailang Yang <kailang@realtek.com.tw>
+ *                    PeiSen Hou <pshou@realtek.com.tw>
  *                    Takashi Iwai <tiwai@suse.de>
  *
@@ -34 +35 @@
 /* ALC880 board config type */
 enum {
-        ALC880_MINIMAL,
         ALC880_3ST,
         ALC880_3ST_DIG,
         ALC880_5ST,
         ALC880_5ST_DIG,
-        ALC880_W810,
-        ALC880_Z71V,
-        ALC880_TEST,
-};
+        ALC880_W810,
+        ALC880_Z71V,
+        ALC880_6ST,
+        ALC880_6ST_DIG,
+        ALC880_F1734,
+        ALC880_ASUS,
+        ALC880_ASUS_DIG,
+        ALC880_ASUS_W1V,
+        ALC880_ASUS_DIG2,
+        ALC880_UNIWILL_DIG,
+        ALC880_CLEVO,
+        ALC880_TCL_S700,
+#ifdef CONFIG_SND_DEBUG
+        ALC880_TEST,
+#endif
+        ALC880_AUTO,
+        ALC880_MODEL_LAST /* last tag */
+};
+
+/* ALC260 models */
+enum {
+        ALC260_BASIC,
+        ALC260_HP,
+        ALC260_HP_3013,
+        ALC260_FUJITSU_S702X,
+        ALC260_AUTO,
+        ALC260_MODEL_LAST /* last tag */
+};
+
+/* ALC262 models */
+enum {
+        ALC262_BASIC,
+        ALC262_AUTO,
+        ALC262_MODEL_LAST /* last tag */
+};
+
+/* ALC861 models */
+enum {
+        ALC861_3ST,
+        ALC861_3ST_DIG,
+        ALC861_6ST_DIG,
+        ALC861_AUTO,
+        ALC861_MODEL_LAST,
+};
+
+/* ALC882 models */
+enum {
+        ALC882_3ST_DIG,
+        ALC882_6ST_DIG,
+        ALC882_AUTO,
+        ALC882_MODEL_LAST,
+};
+
+/* for GPIO Poll */
+#define GPIO_MASK       0x03
 
 struct alc_spec {
         /* codec parameterization */
-        unsigned int front_panel: 1;
-
-        snd_kcontrol_new_t* mixers[2];
+        struct snd_kcontrol_new *mixers[5];     /* mixer arrays */
         unsigned int num_mixers;
 
-        struct hda_verb *init_verbs;
-
-        char* stream_name_analog;
+        const struct hda_verb *init_verbs[5];   /* initialization verbs
+                                                 * don't forget NULL termination!
+                                                 */
+        unsigned int num_init_verbs;
+
+        char *stream_name_analog;       /* analog PCM stream */
         struct hda_pcm_stream *stream_analog_playback;
         struct hda_pcm_stream *stream_analog_capture;
 
-        char* stream_name_digital;
+        char *stream_name_digital;      /* digital PCM stream */ 
         struct hda_pcm_stream *stream_digital_playback;
         struct hda_pcm_stream *stream_digital_capture;
 
         /* playback */
-        struct hda_multi_out multiout;
+        struct hda_multi_out multiout;  /* playback set-up
+                                         * max_channels, dacs must be set
+                                         * dig_out_nid and hp_nid are optional
+                                         */
 
         /* capture */
         unsigned int num_adc_nids;
         hda_nid_t *adc_nids;
-        hda_nid_t dig_in_nid;
+        hda_nid_t dig_in_nid;           /* digital-in NID; optional */
 
         /* capture source */
@@ -74 +129 @@
 
         /* channel model */
-        const struct alc_channel_mode *channel_mode;
+        const struct hda_channel_mode *channel_mode;
         int num_channel_mode;
 
         /* PCM information */
-        struct hda_pcm pcm_rec[2];
-
-        struct semaphore bind_mutex;
-};
-
-/* DAC/ADC assignment */
-
-static hda_nid_t alc880_dac_nids[4] = {
-        /* front, rear, clfe, rear_surr */
-        0x02, 0x05, 0x04, 0x03
-};
-
-static hda_nid_t alc880_w810_dac_nids[3] = {
-        /* front, rear/surround, clfe */
-        0x02, 0x03, 0x04
-};
-
-static hda_nid_t alc880_z71v_dac_nids[1] = {
-    /* front only? */
-    0x02
-};
-
-#if 0
-/* The datasheet says the node 0x07 is connected from inputs,
- * but it shows zero connection in the real implementation.
- */
-static hda_nid_t alc880_adc_nids[3] = {
-        /* ADC0-2 */
-        0x07, 0x08, 0x09,
-};
-#else
-static hda_nid_t alc880_adc_nids[2] = {
-    /* ADC1-2 */
-    0x08, 0x09,
-};
-#endif
-
-#define ALC880_DIGOUT_NID       0x06
-#define ALC880_DIGIN_NID        0x0a
-
-static hda_nid_t alc260_dac_nids[1] = {
-        /* front */
-        0x02,
-};
-
-static hda_nid_t alc260_adc_nids[2] = {
-        /* ADC0-1 */
-        0x04, 0x05,
-};
-
-#define ALC260_DIGOUT_NID       0x03
-#define ALC260_DIGIN_NID        0x06
-
-static struct hda_input_mux alc880_capture_source = {
-        /*.num_items = */4,
-        /*.items = */{
-            { "Mic", 0x0 },
-            { "Front Mic", 0x3 },
-            { "Line", 0x2 },
-            { "CD", 0x4 },
-        },
-};
-
-static struct hda_input_mux alc260_capture_source = {
-        /*.num_items = */4,
-        /*.items = */{
-            { "Mic", 0x0 },
-            { "Front Mic", 0x1 },
-            { "Line", 0x2 },
-            { "CD", 0x4 },
-        },
-};
+        struct hda_pcm pcm_rec[2];      /* used in alc_build_pcms() */
+
+        /* dynamic controls, init_verbs and input_mux */
+        struct auto_pin_cfg autocfg;
+        unsigned int num_kctl_alloc, num_kctl_used;
+        struct snd_kcontrol_new *kctl_alloc;
+        struct hda_input_mux private_imux;
+        hda_nid_t private_dac_nids[5];
+};
+
+/*
+ * configuration template - to be copied to the spec instance
+ */
+struct alc_config_preset {
+        struct snd_kcontrol_new *mixers[5]; /* should be identical size with spec */
+        const struct hda_verb *init_verbs[5];
+        unsigned int num_dacs;
+        hda_nid_t *dac_nids;
+        hda_nid_t dig_out_nid;          /* optional */
+        hda_nid_t hp_nid;               /* optional */
+        unsigned int num_adc_nids;
+        hda_nid_t *adc_nids;
+        hda_nid_t dig_in_nid;
+        unsigned int num_channel_mode;
+        const struct hda_channel_mode *channel_mode;
+        const struct hda_input_mux *input_mux;
+};
+
 
 /*
  * input MUX handling
  */
-static int alc_mux_enum_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int alc_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -161 +172 @@
 }
 
-static int alc_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int alc_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -171 +182 @@
 }
 
-static int alc_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int alc_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -180 +191 @@
 }
 
+
 /*
  * channel mode setting
  */
-struct alc_channel_mode {
-        int channels;
-        const struct hda_verb *sequence;
-};
-
-
-/*
- * channel source setting (2/6 channel selection for 3-stack)
- */
-
-/*
- * set the path ways for 2 channel output
- * need to set the codec line out and mic 1 pin widgets to inputs
- */
+static int alc_ch_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        return snd_hda_ch_mode_info(codec, uinfo, spec->channel_mode,
+                                    spec->num_channel_mode);
+}
+
+static int alc_ch_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        return snd_hda_ch_mode_get(codec, ucontrol, spec->channel_mode,
+                                   spec->num_channel_mode, spec->multiout.max_channels);
+}
+
+static int alc_ch_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        return snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode,
+                                   spec->num_channel_mode, &spec->multiout.max_channels);
+}
+
+
+/*
+ * Control of pin widget settings via the mixer.  Only boolean settings are
+ * supported, so VrefEn can't be controlled using these functions as they
+ * stand.
+ */
+static int alc_pinctl_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int alc_pinctl_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value & 0xffff;
+        long mask = (kcontrol->private_value >> 16) & 0xff;
+        long *valp = ucontrol->value.integer.value;
+
+        *valp = 0;
+        if (snd_hda_codec_read(codec,nid,0,AC_VERB_GET_PIN_WIDGET_CONTROL,0x00) & mask)
+                *valp = 1;
+        return 0;
+}
+
+static int alc_pinctl_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value & 0xffff;
+        long mask = (kcontrol->private_value >> 16) & 0xff;
+        long *valp = ucontrol->value.integer.value;
+        unsigned int pinctl = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_PIN_WIDGET_CONTROL,0x00);
+        int change = ((pinctl & mask)!=0) != *valp;
+
+        if (change)
+                snd_hda_codec_write(codec,nid,0,AC_VERB_SET_PIN_WIDGET_CONTROL,
+                        *valp?(pinctl|mask):(pinctl&~mask));
+        return change;
+}
+
+#define ALC_PINCTL_SWITCH(xname, nid, mask) \
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .info = alc_pinctl_switch_info, \
+          .get = alc_pinctl_switch_get, \
+          .put = alc_pinctl_switch_put, \
+          .private_value = (nid) | (mask<<16) }
+
+
+/*
+ * set up from the preset table
+ */
+static void setup_preset(struct alc_spec *spec, const struct alc_config_preset *preset)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(preset->mixers) && preset->mixers[i]; i++)
+                spec->mixers[spec->num_mixers++] = preset->mixers[i];
+        for (i = 0; i < ARRAY_SIZE(preset->init_verbs) && preset->init_verbs[i]; i++)
+                spec->init_verbs[spec->num_init_verbs++] = preset->init_verbs[i];
+        
+        spec->channel_mode = preset->channel_mode;
+        spec->num_channel_mode = preset->num_channel_mode;
+
+        spec->multiout.max_channels = spec->channel_mode[0].channels;
+
+        spec->multiout.num_dacs = preset->num_dacs;
+        spec->multiout.dac_nids = preset->dac_nids;
+        spec->multiout.dig_out_nid = preset->dig_out_nid;
+        spec->multiout.hp_nid = preset->hp_nid;
+        
+        spec->input_mux = preset->input_mux;
+
+        spec->num_adc_nids = preset->num_adc_nids;
+        spec->adc_nids = preset->adc_nids;
+        spec->dig_in_nid = preset->dig_in_nid;
+}
+
+/*
+ * ALC880 3-stack model
+ *
+ * DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0e)
+ * Pin assignment: Front = 0x14, Line-In/Surr = 0x1a, Mic/CLFE = 0x18, F-Mic = 0x1b
+ *                 HP = 0x19
+ */
+
+static hda_nid_t alc880_dac_nids[4] = {
+        /* front, rear, clfe, rear_surr */
+        0x02, 0x05, 0x04, 0x03
+};
+
+static hda_nid_t alc880_adc_nids[3] = {
+        /* ADC0-2 */
+        0x07, 0x08, 0x09,
+};
+
+/* The datasheet says the node 0x07 is connected from inputs,
+ * but it shows zero connection in the real implementation on some devices.
+ * Note: this is a 915GAV bug, fixed on 915GLV
+ */
+static hda_nid_t alc880_adc_nids_alt[2] = {
+        /* ADC1-2 */
+        0x08, 0x09,
+};
+
+#define ALC880_DIGOUT_NID       0x06
+#define ALC880_DIGIN_NID        0x0a
+
+static struct hda_input_mux alc880_capture_source = {
+        .num_items = 4,
+        .items = {
+                { "Mic", 0x0 },
+                { "Front Mic", 0x3 },
+                { "Line", 0x2 },
+                { "CD", 0x4 },
+        },
+};
+
+/* channel source setting (2/6 channel selection for 3-stack) */
+/* 2ch mode */
 static struct hda_verb alc880_threestack_ch2_init[] = {
-        /* set pin widget 1Ah (line in) for input */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        /* set pin widget 18h (mic1) for input, for mic also enable the vref */
-        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
-        /* mute the output for Line In PW */
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
-        /* mute for Mic1 PW */
-        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
+        /* set line-in to input, mute it */
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
+        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+        /* set mic-in to input vref 80%, mute it */
+        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
+        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         {0} /* end */
 };
 
-/*
- * 6ch mode
- * need to set the codec line out and mic 1 pin widgets to outputs
- */
+/* 6ch mode */
 static struct hda_verb alc880_threestack_ch6_init[] = {
-        /* set pin widget 1Ah (line in) for output */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        /* set pin widget 18h (mic1) for output */
-        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        /* unmute the output for Line In PW */
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000 },
-        /* unmute for Mic1 PW */
-        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000 },
-        /* for rear channel output using Line In 1
-         * set select widget connection (nid = 0x12) - to summer node
-         * for rear NID = 0x0f...offset 3 in connection list
-         */
-        { 0x12, AC_VERB_SET_CONNECT_SEL, 0x3 },
-        /* for Mic1 - retask for center/lfe */
-        /* set select widget connection (nid = 0x10) - to summer node for
-         * front CLFE NID = 0x0e...offset 2 in connection list
-         */
-        { 0x10, AC_VERB_SET_CONNECT_SEL, 0x2 },
+        /* set line-in to output, unmute it */
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        /* set mic-in to output, unmute it */
+        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         {0} /* end */
 };
 
-static struct alc_channel_mode alc880_threestack_modes[2] = {
+static struct hda_channel_mode alc880_threestack_modes[2] = {
         { 2, alc880_threestack_ch2_init },
         { 6, alc880_threestack_ch6_init },
 };
 
-
-/*
- * channel source setting (6/8 channel selection for 5-stack)
- */
-
-/* set the path ways for 6 channel output
- * need to set the codec line out and mic 1 pin widgets to inputs
- */
+static struct snd_kcontrol_new alc880_three_stack_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Surround Playback Switch", 0x0f, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x3, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),
+        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
+        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x19, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Channel Mode",
+                .info = alc_ch_mode_info,
+                .get = alc_ch_mode_get,
+                .put = alc_ch_mode_put,
+        },
+        {0} /* end */
+};
+
+/* capture mixer elements */
+static struct snd_kcontrol_new alc880_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 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 = 3,
+                .info = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
+        },
+        {0} /* end */
+};
+
+/* capture mixer elements (in case NID 0x07 not available) */
+static struct snd_kcontrol_new alc880_capture_alt_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 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 = 2,
+                .info = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
+        },
+        {0} /* end */
+};
+
+
+
+/*
+ * ALC880 5-stack model
+ *
+ * DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0d), Side = 0x02 (0xd)
+ * Pin assignment: Front = 0x14, Surr = 0x17, CLFE = 0x16
+ *                 Line-In/Side = 0x1a, Mic = 0x18, F-Mic = 0x1b, HP = 0x19
+ */
+
+/* additional mixers to alc880_three_stack_mixer */
+static struct snd_kcontrol_new alc880_five_stack_mixer[] = {
+        HDA_CODEC_VOLUME("Side Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Side Playback Switch", 0x0d, 2, HDA_INPUT),
+        {0} /* end */
+};
+
+/* channel source setting (6/8 channel selection for 5-stack) */
+/* 6ch mode */
 static struct hda_verb alc880_fivestack_ch6_init[] = {
-        /* set pin widget 1Ah (line in) for input */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        /* mute the output for Line In PW */
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
+        /* set line-in to input, mute it */
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
+        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         {0} /* end */
 };
 
-/* need to set the codec line out and mic 1 pin widgets to outputs */
+/* 8ch mode */
 static struct hda_verb alc880_fivestack_ch8_init[] = {
-        /* set pin widget 1Ah (line in) for output */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        /* unmute the output for Line In PW */
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000 },
-        /* output for surround channel output using Line In 1 */
-        /* set select widget connection (nid = 0x12) - to summer node
-         * for surr_rear NID = 0x0d...offset 1 in connection list
-         */
-        { 0x12, AC_VERB_SET_CONNECT_SEL, 0x1 },
+        /* set line-in to output, unmute it */
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         {0} /* end */
 };
 
-static struct alc_channel_mode alc880_fivestack_modes[2] = {
+static struct hda_channel_mode alc880_fivestack_modes[2] = {
         { 6, alc880_fivestack_ch6_init },
         { 8, alc880_fivestack_ch8_init },
 };
 
-/*
- * channel source setting for W810 system
+
+/*
+ * ALC880 6-stack model
+ *
+ * DAC: Front = 0x02 (0x0c), Surr = 0x03 (0x0d), CLFE = 0x04 (0x0e), Side = 0x05 (0x0f)
+ * Pin assignment: Front = 0x14, Surr = 0x15, CLFE = 0x16, Side = 0x17,
+ *   Mic = 0x18, F-Mic = 0x19, Line = 0x1a, HP = 0x1b
+ */
+
+static hda_nid_t alc880_6st_dac_nids[4] = {
+        /* front, rear, clfe, rear_surr */
+        0x02, 0x03, 0x04, 0x05
+};      
+
+static struct hda_input_mux alc880_6stack_capture_source = {
+        .num_items = 4,
+        .items = {
+                { "Mic", 0x0 },
+                { "Front Mic", 0x1 },
+                { "Line", 0x2 },
+                { "CD", 0x4 },
+        },
+};
+
+/* fixed 8-channels */
+static struct hda_channel_mode alc880_sixstack_modes[1] = {
+        { 8, NULL },
+};
+
+static struct snd_kcontrol_new alc880_six_stack_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
+        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Channel Mode",
+                .info = alc_ch_mode_info,
+                .get = alc_ch_mode_get,
+                .put = alc_ch_mode_put,
+        },
+        {0} /* end */
+};
+
+
+/*
+ * ALC880 W810 model
  *
  * W810 has rear IO for:
@@ -286 +554 @@
  * The system also has a pair of internal speakers, and a headphone jack.
  * These are both connected to Line2 on the codec, hence to DAC 02.
- *
+ * 
  * There is a variable resistor to control the speaker or headphone
  * volume. This is a hardware-only device without a software API.
@@ -300 +568 @@
  */
 
-static struct alc_channel_mode alc880_w810_modes[1] = {
+static hda_nid_t alc880_w810_dac_nids[3] = {
+        /* front, rear/surround, clfe */
+        0x02, 0x03, 0x04
+};
+
+/* fixed 6 channels */
+static struct hda_channel_mode alc880_w810_modes[1] = {
         { 6, NULL }
 };
 
-static struct alc_channel_mode alc880_z71v_modes[1] = {
-    { 2, NULL }
-};
-
-/*
- */
-static int alc880_ch_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        int items = kcontrol->private_value ? (int)kcontrol->private_value : 2;
-
-        snd_assert(spec->channel_mode, return -ENXIO);
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = items;
-        if (uinfo->value.enumerated.item >= items)
-            uinfo->value.enumerated.item = items - 1;
-        sprintf(uinfo->value.enumerated.name, "%dch",
-                spec->channel_mode[uinfo->value.enumerated.item].channels);
-        return 0;
-}
-
-static int alc880_ch_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct alc_spec *spec = codec->spec;
-    int items = kcontrol->private_value ? (int)kcontrol->private_value : 2;
-    int i;
-
-    snd_assert(spec->channel_mode, return -ENXIO);
-    for (i = 0; i < items; i++) {
-        if (spec->multiout.max_channels == spec->channel_mode[i].channels) {
-            ucontrol->value.enumerated.item[0] = i;
-            break;
-        }
-    }
-    return 0;
-}
-
-static int alc880_ch_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        int mode;
-
-        snd_assert(spec->channel_mode, return -ENXIO);
-        mode = ucontrol->value.enumerated.item[0] ? 1 : 0;
-        if (spec->multiout.max_channels == spec->channel_mode[mode].channels &&
-            ! codec->in_resume)
-                return 0;
-
-        /* change the current channel setting */
-        spec->multiout.max_channels = spec->channel_mode[mode].channels;
-        if (spec->channel_mode[mode].sequence)
-                snd_hda_sequence_write(codec, spec->channel_mode[mode].sequence);
-
-        return 1;
-}
-
-
-/*
- * bound volume controls
+/* Pin assignment: Front = 0x14, Surr = 0x15, CLFE = 0x16, HP = 0x1b */
+static struct snd_kcontrol_new alc880_w810_base_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+        {0} /* end */
+};
+
+
+/*
+ * Z710V model
  *
- * bind multiple volumes (# indices, from 0)
- */
-
-#define AMP_VAL_IDX_SHIFT       19
-#define AMP_VAL_IDX_MASK        (0x0f<<19)
-
-static int alc_bind_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct alc_spec *spec = codec->spec;
-    unsigned long pval;
-
-    down(&spec->bind_mutex);
-    pval = kcontrol->private_value;
-    kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */
-    snd_hda_mixer_amp_volume_info(kcontrol, uinfo);
-    kcontrol->private_value = pval;
-    up(&spec->bind_mutex);
-    return 0;
-}
-
-static int alc_bind_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct alc_spec *spec = codec->spec;
-    unsigned long pval;
-
-    down(&spec->bind_mutex);
-    pval = kcontrol->private_value;
-    kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */
-    snd_hda_mixer_amp_volume_get(kcontrol, ucontrol);
-    kcontrol->private_value = pval;
-    up(&spec->bind_mutex);
-    return 0;
-}
-
-static int alc_bind_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct alc_spec *spec = codec->spec;
-    unsigned long pval;
-    int i, indices, change = 0;
-
-    down(&spec->bind_mutex);
-    pval = kcontrol->private_value;
-    indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT;
-    for (i = 0; i < indices; i++) {
-        kcontrol->private_value = (pval & ~AMP_VAL_IDX_MASK) | (i << AMP_VAL_IDX_SHIFT);
-        change |= snd_hda_mixer_amp_volume_put(kcontrol, ucontrol);
-    }
-    kcontrol->private_value = pval;
-    up(&spec->bind_mutex);
-    return change;
-}
-
-#define ALC_BIND_VOL_MONO(xname, nid, channel, indices, direction) \
-    { SNDRV_CTL_ELEM_IFACE_MIXER, 0, 0, xname, 0, 0, 0, \
-     alc_bind_vol_info, \
-     alc_bind_vol_get, \
-     alc_bind_vol_put, \
-     HDA_COMPOSE_AMP_VAL(nid, channel, indices, direction) }
-
-#define ALC_BIND_VOL(xname,nid,indices,dir) ALC_BIND_VOL_MONO(xname,nid,3,indices,dir)
-
-/*
- */
-/* 3-stack mode
- * Pin assignment: Front=0x14, Line-In/Rear=0x1a, Mic/CLFE=0x18, F-Mic=0x1b
- *                 HP=0x19
- */
-static snd_kcontrol_new_t alc880_base_mixer[] = {
-    ALC_BIND_VOL("Front Playback Volume", 0x0c, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-    ALC_BIND_VOL("Surround Playback Volume", 0x0f, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Surround Playback Switch", 0x1a, 0x0, HDA_OUTPUT),
-    ALC_BIND_VOL_MONO("Center Playback Volume", 0x0e, 1, 2, HDA_OUTPUT),
-    ALC_BIND_VOL_MONO("LFE Playback Volume", 0x0e, 2, 2, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x18, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x18, 2, 0x0, HDA_OUTPUT),
+ * DAC: Front = 0x02 (0x0c), HP = 0x03 (0x0d)
+ * Pin assignment: Front = 0x14, HP = 0x15, Mic = 0x18, Mic2 = 0x19(?), Line = 0x1a
+ */
+
+static hda_nid_t alc880_z71v_dac_nids[1] = {
+        0x02
+};
+#define ALC880_Z71V_HP_DAC      0x03
+
+/* fixed 2 channels */
+static struct hda_channel_mode alc880_2_jack_modes[1] = {
+        { 2, NULL }
+};
+
+static struct snd_kcontrol_new alc880_z71v_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        {0} /* end */
+};
+
+
+/* FIXME! */
+/*
+ * ALC880 F1734 model
+ *
+ * DAC: HP = 0x02 (0x0c), Front = 0x03 (0x0d)
+ * Pin assignment: HP = 0x14, Front = 0x15, Mic = 0x18
+ */
+
+static hda_nid_t alc880_f1734_dac_nids[1] = {
+        0x03
+};
+#define ALC880_F1734_HP_DAC     0x02
+
+static struct snd_kcontrol_new alc880_f1734_mixer[] = {
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Internal Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        {0} /* end */
+};
+
+
+/* FIXME! */
+/*
+ * ALC880 ASUS model
+ *
+ * DAC: HP/Front = 0x02 (0x0c), Surr = 0x03 (0x0d), CLFE = 0x04 (0x0e)
+ * Pin assignment: HP/Front = 0x14, Surr = 0x15, CLFE = 0x16,
+ *  Mic = 0x18, Line = 0x1a
+ */
+
+#define alc880_asus_dac_nids    alc880_w810_dac_nids    /* identical with w810 */
+#define alc880_asus_modes       alc880_threestack_modes /* 2/6 channel mode */
+
+static struct snd_kcontrol_new alc880_asus_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x3, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Channel Mode",
+                .info = alc_ch_mode_info,
+                .get = alc_ch_mode_get,
+                .put = alc_ch_mode_put,
+        },
+        {0} /* end */
+};
+
+/* FIXME! */
+/*
+ * ALC880 ASUS W1V model
+ *
+ * DAC: HP/Front = 0x02 (0x0c), Surr = 0x03 (0x0d), CLFE = 0x04 (0x0e)
+ * Pin assignment: HP/Front = 0x14, Surr = 0x15, CLFE = 0x16,
+ *  Mic = 0x18, Line = 0x1a, Line2 = 0x1b
+ */
+
+/* additional mixers to alc880_asus_mixer */
+static struct snd_kcontrol_new alc880_asus_w1v_mixer[] = {
+        HDA_CODEC_VOLUME("Line2 Playback Volume", 0x0b, 0x03, HDA_INPUT),
+        HDA_CODEC_MUTE("Line2 Playback Switch", 0x0b, 0x03, HDA_INPUT),
+        {0} /* end */
+};
+
+/* additional mixers to alc880_asus_mixer */
+static struct snd_kcontrol_new alc880_pcbeep_mixer[] = {
         HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-        ALC_BIND_VOL("Headphone Playback Volume", 0x0d, 2, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x19, 0x0, HDA_OUTPUT),
-        /* We don't use NID 0x07 - see above */
-        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
+        {0} /* end */
+};
+
+/* TCL S700 */
+static struct snd_kcontrol_new alc880_tcl_s700_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0B, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0B, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0B, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0B, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 /* The multiple "Capture Source" controls confuse alsamixer
                  * So call somewhat different..
@@ -471 +727 @@
                  */
                 /* .name = "Capture Source", */
-                /*.name = */"Input Source",0,0,
-                /*.count = */2,
-                /*.info = */alc_mux_enum_info,
-                /*.get = */alc_mux_enum_get,
-                /*.put = */alc_mux_enum_put,0
-        },
+                .name = "Input Source",
+                .count = 1,
+                .info = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
+        },
+        {0} /* end */
+};
+
+/*
+ * build control elements
+ */
+static int alc_build_controls(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int err;
+        int i;
+
+        for (i = 0; i < spec->num_mixers; i++) {
+                err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
+                if (err < 0)
+                        return err;
+        }
+
+        if (spec->multiout.dig_out_nid) {
+                err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
+                if (err < 0)
+                        return err;
+        }
+        if (spec->dig_in_nid) {
+                err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
+                if (err < 0)
+                        return err;
+        }
+        return 0;
+}
+
+
+/*
+ * initialize the codec volumes, etc
+ */
+
+/*
+ * generic initialization of ADC, input mixers and output mixers
+ */
+static struct hda_verb alc880_volume_init_verbs[] = {
+        /*
+         * Unmute ADC0-2 and set the default input to mic-in
+         */
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x09, 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
+         * Note: PASD motherboards uses the Line In 2 as the input for front panel
+         * mic (mic 2)
+         */
+        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+        /*
+         * Set up output mixers (0x0c - 0x0f)
+         */
+        /* set vol=0 to output mixers */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* set up input amps for analog loopback */
+        /* Amp Indices: DAC = 0, mixer = 1 */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+
+        {0}
+};
+
+/*
+ * 3-stack pin configuration:
+ * front = 0x14, mic/clfe = 0x18, HP = 0x19, line/surr = 0x1a, f-mic = 0x1b
+ */
+static struct hda_verb alc880_pin_3stack_init_verbs[] = {
+        /*
+         * preset connection lists of input pins
+         * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround
+         */
+        {0x10, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */
+        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+        {0x12, AC_VERB_SET_CONNECT_SEL, 0x03}, /* line/surround */
+
+        /*
+         * Set pin mode and muting
+         */
+        /* set front pin widgets 0x14 for output */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Mic1 (rear panel) pin widget for input and vref at 80% */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Mic2 (as headphone out) for HP output */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Line In pin widget for input */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Line2 (as front mic) pin widget for input and vref at 80% */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* CD pin widget for input */
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+        {0}
+};
+
+/*
+ * 5-stack pin configuration:
+ * front = 0x14, surround = 0x17, clfe = 0x16, mic = 0x18, HP = 0x19,
+ * line-in/side = 0x1a, f-mic = 0x1b
+ */
+static struct hda_verb alc880_pin_5stack_init_verbs[] = {
+        /*
+         * preset connection lists of input pins
+         * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround
+         */
+        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+        {0x12, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/side */
+
+        /*
+         * Set pin mode and muting
+         */
+        /* set pin widgets 0x14-0x17 for output */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* unmute pins for output (no gain on this amp) */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        /* Mic1 (rear panel) pin widget for input and vref at 80% */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Mic2 (as headphone out) for HP output */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Line In pin widget for input */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Line2 (as front mic) pin widget for input and vref at 80% */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* CD pin widget for input */
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+        {0}
+};
+
+/*
+ * W810 pin configuration:
+ * front = 0x14, surround = 0x15, clfe = 0x16, HP = 0x1b
+ */
+static struct hda_verb alc880_pin_w810_init_verbs[] = {
+        /* hphone/speaker input selector: front DAC */
+        {0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+
+        {0}
+};
+
+/*
+ * Z71V pin configuration:
+ * Speaker-out = 0x14, HP = 0x15, Mic = 0x18, Line-in = 0x1a, Mic2 = 0x1b (?)
+ */
+static struct hda_verb alc880_pin_z71v_init_verbs[] = {
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+        {0}
+};
+
+/*
+ * 6-stack pin configuration:
+ * front = 0x14, surr = 0x15, clfe = 0x16, side = 0x17, mic = 0x18, f-mic = 0x19,
+ * line = 0x1a, HP = 0x1b
+ */
+static struct hda_verb alc880_pin_6stack_init_verbs[] = {
+        {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        
+        {0}
+};
+
+/* FIXME! */
+/*
+ * F1734 pin configuration:
+ * HP = 0x14, speaker-out = 0x15, mic = 0x18
+ */
+static struct hda_verb alc880_pin_f1734_init_verbs[] = {
+        {0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
+        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x12, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x13, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+        {0}
+};
+
+/* FIXME! */
+/*
+ * ASUS pin configuration:
+ * HP/front = 0x14, surr = 0x15, clfe = 0x16, mic = 0x18, line = 0x1a
+ */
+static struct hda_verb alc880_pin_asus_init_verbs[] = {
+        {0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
+        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x12, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x13, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        
+        {0}
+};
+
+/* Enable GPIO mask and set output */
+static struct hda_verb alc880_gpio1_init_verbs[] = {
+        {0x01, AC_VERB_SET_GPIO_MASK, 0x01},
+        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
+        {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
+
+        {0}
+};
+
+/* Enable GPIO mask and set output */
+static struct hda_verb alc880_gpio2_init_verbs[] = {
+        {0x01, AC_VERB_SET_GPIO_MASK, 0x02},
+        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},
+        {0x01, AC_VERB_SET_GPIO_DATA, 0x02},
+
+        {0}
+};
+
+/* Clevo m520g init */
+static struct hda_verb alc880_pin_clevo_init_verbs[] = {
+        /* headphone output */
+        {0x11, AC_VERB_SET_CONNECT_SEL, 0x01},
+        /* line-out */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Line-in */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* CD */
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Mic1 (rear panel) */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Mic2 (front panel) */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* headphone */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* change to EAPD mode */
+        {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
+        {0x20, AC_VERB_SET_PROC_COEF,  0x3060},
+
+        {0}
+};
+
+static struct hda_verb alc880_pin_tcl_S700_init_verbs[] = {
+        /* Headphone output */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        /* Front output*/
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* Line In pin widget for input */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        /* CD pin widget for input */
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        /* Mic1 (rear panel) pin widget for input and vref at 80% */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+
+        /* change to EAPD mode */
+        {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
+        {0x20, AC_VERB_SET_PROC_COEF,  0x3070},
+
+        {0}
+};
+
+/*
+ */
+
+static int alc_init(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int i;
+
+        for (i = 0; i < spec->num_init_verbs; i++)
+                snd_hda_sequence_write(codec, spec->init_verbs[i]);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+/*
+ * resume
+ */
+static int alc_resume(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        alc_init(codec);
+        for (i = 0; i < spec->num_mixers; i++)
+                snd_hda_resume_ctls(codec, spec->mixers[i]);
+        if (spec->multiout.dig_out_nid)
+                snd_hda_resume_spdif_out(codec);
+        if (spec->dig_in_nid)
+                snd_hda_resume_spdif_in(codec);
+
+        return 0;
+}
+#endif
+
+/*
+ * Analog playback callbacks
+ */
+static int alc880_playback_pcm_open(struct hda_pcm_stream *hinfo,
+                                    struct hda_codec *codec,
+                                    struct snd_pcm_substream *substream)
+{
+        struct alc_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
+}
+
+static int alc880_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                       struct hda_codec *codec,
+                                       unsigned int stream_tag,
+                                       unsigned int format,
+                                       struct snd_pcm_substream *substream)
+{
+        struct alc_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
+                                                format, substream);
+}
+
+static int alc880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                       struct hda_codec *codec,
+                                       struct snd_pcm_substream *substream)
+{
+        struct alc_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
+}
+
+/*
+ * Digital out
+ */
+static int alc880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
+                                        struct hda_codec *codec,
+                                        struct snd_pcm_substream *substream)
+{
+        struct alc_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
+}
+
+static int alc880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
+                                         struct hda_codec *codec,
+                                         struct snd_pcm_substream *substream)
+{
+        struct alc_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
+}
+
+/*
+ * Analog capture
+ */
+static int alc880_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                      struct hda_codec *codec,
+                                      unsigned int stream_tag,
+                                      unsigned int format,
+                                      struct snd_pcm_substream *substream)
+{
+        struct alc_spec *spec = codec->spec;
+
+        snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
+                                   stream_tag, 0, format);
+        return 0;
+}
+
+static int alc880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                      struct hda_codec *codec,
+                                      struct snd_pcm_substream *substream)
+{
+        struct alc_spec *spec = codec->spec;
+
+        snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number], 0, 0, 0);
+        return 0;
+}
+
+
+/*
+ */
+static struct hda_pcm_stream alc880_pcm_analog_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 8,
+        /* NID is set in alc_build_pcms */
+        .ops = {
+                .open = alc880_playback_pcm_open,
+                .prepare = alc880_playback_pcm_prepare,
+                .cleanup = alc880_playback_pcm_cleanup
+        },
+};
+
+static struct hda_pcm_stream alc880_pcm_analog_capture = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        /* NID is set in alc_build_pcms */
+        .ops = {
+                .prepare = alc880_capture_pcm_prepare,
+                .cleanup = alc880_capture_pcm_cleanup
+        },
+};
+
+static struct hda_pcm_stream alc880_pcm_digital_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        /* NID is set in alc_build_pcms */
+        .ops = {
+                .open = alc880_dig_playback_pcm_open,
+                .close = alc880_dig_playback_pcm_close
+        },
+};
+
+static struct hda_pcm_stream alc880_pcm_digital_capture = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        /* NID is set in alc_build_pcms */
+};
+
+static int alc_build_pcms(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        struct hda_pcm *info = spec->pcm_rec;
+        int i;
+
+        codec->num_pcms = 1;
+        codec->pcm_info = info;
+
+        info->name = spec->stream_name_analog;
+        if (spec->stream_analog_playback) {
+                snd_assert(spec->multiout.dac_nids, return -EINVAL);
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_analog_playback);
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
+        }
+        if (spec->stream_analog_capture) {
+                snd_assert(spec->adc_nids, return -EINVAL);
+                info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
+                info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
+        }
+
+        if (spec->channel_mode) {
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = 0;
+                for (i = 0; i < spec->num_channel_mode; i++) {
+                        if (spec->channel_mode[i].channels > info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max) {
+                                info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->channel_mode[i].channels;
+                        }
+                }
+        }
+
+        if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
+                codec->num_pcms++;
+                info++;
+                info->name = spec->stream_name_digital;
+                if (spec->multiout.dig_out_nid &&
+                    spec->stream_digital_playback) {
+                        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_digital_playback);
+                        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
+                }
+                if (spec->dig_in_nid &&
+                    spec->stream_digital_capture) {
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_digital_capture);
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid;
+                }
+        }
+
+        return 0;
+}
+
+static void alc_free(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int i;
+
+        if (! spec)
+                return;
+
+        if (spec->kctl_alloc) {
+                for (i = 0; i < spec->num_kctl_used; i++)
+                        kfree(spec->kctl_alloc[i].name);
+                kfree(spec->kctl_alloc);
+        }
+        kfree(spec);
+}
+
+/*
+ */
+static struct hda_codec_ops alc_patch_ops = {
+        .build_controls = alc_build_controls,
+        .build_pcms = alc_build_pcms,
+        .init = alc_init,
+        .free = alc_free,
+#ifdef CONFIG_PM
+        .resume = alc_resume,
+#endif
+};
+
+
+/*
+ * Test configuration for debugging
+ *
+ * Almost all inputs/outputs are enabled.  I/O pins can be configured via
+ * enum controls.
+ */
+#ifdef CONFIG_SND_DEBUG
+static hda_nid_t alc880_test_dac_nids[4] = {
+        0x02, 0x03, 0x04, 0x05
+};
+
+static struct hda_input_mux alc880_test_capture_source = {
+        .num_items = 5,
+        .items = {
+                { "In-1", 0x0 },
+                { "In-2", 0x1 },
+                { "In-3", 0x2 },
+                { "In-4", 0x3 },
+                { "CD", 0x4 },
+        },
+};
+
+static struct hda_channel_mode alc880_test_modes[4] = {
+        { 2, NULL },
+        { 4, NULL },
+        { 6, NULL },
+        { 8, NULL },
+};
+
+static int alc_test_pin_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = {
+                "N/A", "Line Out", "HP Out",
+                "In Hi-Z", "In 50%", "In Grd", "In 80%", "In 100%"
+        };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 8;
+        if (uinfo->value.enumerated.item >= 8)
+                uinfo->value.enumerated.item = 7;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int alc_test_pin_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+        unsigned int pin_ctl, item = 0;
+
+        pin_ctl = snd_hda_codec_read(codec, nid, 0,
+                                     AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+        if (pin_ctl & AC_PINCTL_OUT_EN) {
+                if (pin_ctl & AC_PINCTL_HP_EN)
+                        item = 2;
+                else
+                        item = 1;
+        } else if (pin_ctl & AC_PINCTL_IN_EN) {
+                switch (pin_ctl & AC_PINCTL_VREFEN) {
+                case AC_PINCTL_VREF_HIZ: item = 3; break;
+                case AC_PINCTL_VREF_50:  item = 4; break;
+                case AC_PINCTL_VREF_GRD: item = 5; break;
+                case AC_PINCTL_VREF_80:  item = 6; break;
+                case AC_PINCTL_VREF_100: item = 7; break;
+                }
+        }
+        ucontrol->value.enumerated.item[0] = item;
+        return 0;
+}
+
+static int alc_test_pin_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+        static unsigned int ctls[] = {
+                0, AC_PINCTL_OUT_EN, AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN,
+                AC_PINCTL_IN_EN | AC_PINCTL_VREF_HIZ,
+                AC_PINCTL_IN_EN | AC_PINCTL_VREF_50,
+                AC_PINCTL_IN_EN | AC_PINCTL_VREF_GRD,
+                AC_PINCTL_IN_EN | AC_PINCTL_VREF_80,
+                AC_PINCTL_IN_EN | AC_PINCTL_VREF_100,
+        };
+        unsigned int old_ctl, new_ctl;
+
+        old_ctl = snd_hda_codec_read(codec, nid, 0,
+                                     AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+        new_ctl = ctls[ucontrol->value.enumerated.item[0]];
+        if (old_ctl != new_ctl) {
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, new_ctl);
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                    ucontrol->value.enumerated.item[0] >= 3 ? 0xb080 : 0xb000);
+                return 1;
+        }
+        return 0;
+}
+
+static int alc_test_pin_src_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = {
+                "Front", "Surround", "CLFE", "Side"
+        };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 4;
+        if (uinfo->value.enumerated.item >= 4)
+                uinfo->value.enumerated.item = 3;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int alc_test_pin_src_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+        unsigned int sel;
+
+        sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0);
+        ucontrol->value.enumerated.item[0] = sel & 3;
+        return 0;
+}
+
+static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+        unsigned int sel;
+
+        sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0) & 3;
+        if (ucontrol->value.enumerated.item[0] != sel) {
+                sel = ucontrol->value.enumerated.item[0] & 3;
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, sel);
+                return 1;
+        }
+        return 0;
+}
+
+#define PIN_CTL_TEST(xname,nid) {                       \
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
+                        .name = xname,                 \
+                        .info = alc_test_pin_ctl_info, \
+                        .get = alc_test_pin_ctl_get,   \
+                        .put = alc_test_pin_ctl_put,   \
+                        .private_value = nid           \
+                        }
+
+#define PIN_SRC_TEST(xname,nid) {                       \
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
+                        .name = xname,                 \
+                        .info = alc_test_pin_src_info, \
+                        .get = alc_test_pin_src_get,   \
+                        .put = alc_test_pin_src_put,   \
+                        .private_value = nid           \
+                        }
+
+static struct snd_kcontrol_new alc880_test_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("CLFE Playback Volume", 0x0e, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_BIND_MUTE("CLFE Playback Switch", 0x0e, 2, HDA_INPUT),
+        HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
+        PIN_CTL_TEST("Front Pin Mode", 0x14),
+        PIN_CTL_TEST("Surround Pin Mode", 0x15),
+        PIN_CTL_TEST("CLFE Pin Mode", 0x16),
+        PIN_CTL_TEST("Side Pin Mode", 0x17),
+        PIN_CTL_TEST("In-1 Pin Mode", 0x18),
+        PIN_CTL_TEST("In-2 Pin Mode", 0x19),
+        PIN_CTL_TEST("In-3 Pin Mode", 0x1a),
+        PIN_CTL_TEST("In-4 Pin Mode", 0x1b),
+        PIN_SRC_TEST("In-1 Pin Source", 0x18),
+        PIN_SRC_TEST("In-2 Pin Source", 0x19),
+        PIN_SRC_TEST("In-3 Pin Source", 0x1a),
+        PIN_SRC_TEST("In-4 Pin Source", 0x1b),
+        HDA_CODEC_VOLUME("In-1 Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("In-1 Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("In-2 Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("In-2 Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("In-3 Playback Volume", 0x0b, 0x2, HDA_INPUT),
+        HDA_CODEC_MUTE("In-3 Playback Switch", 0x0b, 0x2, HDA_INPUT),
+        HDA_CODEC_VOLUME("In-4 Playback Volume", 0x0b, 0x3, HDA_INPUT),
+        HDA_CODEC_MUTE("In-4 Playback Switch", 0x0b, 0x3, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x4, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x4, HDA_INPUT),
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-                /*.name = */"Channel Mode",0,0,0,
-                /*.info = */alc880_ch_mode_info,
-                /*.get = */alc880_ch_mode_get,
-                /*.put = */alc880_ch_mode_put,0
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Channel Mode",
+                .info = alc_ch_mode_info,
+                .get = alc_ch_mode_get,
+                .put = alc_ch_mode_put,
         },
         {0} /* end */
 };
 
-/* 5-stack mode
- * Pin assignment: Front=0x14, Rear=0x17, CLFE=0x16
- *                 Line-In/Side=0x1a, Mic=0x18, F-Mic=0x1b, HP=0x19
- */
-static snd_kcontrol_new_t alc880_five_stack_mixer[] = {
-    ALC_BIND_VOL("Front Playback Volume", 0x0c, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-    ALC_BIND_VOL("Surround Playback Volume", 0x0f, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Surround Playback Switch", 0x17, 0x0, HDA_OUTPUT),
-    ALC_BIND_VOL_MONO("Center Playback Volume", 0x0e, 1, 2, HDA_OUTPUT),
-    ALC_BIND_VOL_MONO("LFE Playback Volume", 0x0e, 2, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x16, 1, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
-    ALC_BIND_VOL("Side Playback Volume", 0x0d, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Side Playback Switch", 0x1a, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
-    HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-    HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
-    HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
-    HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x3, HDA_INPUT),
-    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),
-    HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-    HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-    /* HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT), */
-    HDA_CODEC_MUTE("Headphone Playback Switch", 0x19, 0x0, HDA_OUTPUT),
-    /* We don't use NID 0x07 - see above */
-    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
-    {
-        SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /* The multiple "Capture Source" controls confuse alsamixer
-         * So call somewhat different..
-         * FIXME: the controls appear in the "playback" view!
-         */
-        /* .name = "Capture Source", */
-        "Input Source",0,0,
-        2,
-        alc_mux_enum_info,
-        alc_mux_enum_get,
-        alc_mux_enum_put,0
-    },
-    {
-        SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        "Channel Mode",0,0,0,
-        alc880_ch_mode_info,
-        alc880_ch_mode_get,
-        alc880_ch_mode_put,0
-    },
-    {0} /* end */
-};
-
-static snd_kcontrol_new_t alc880_w810_base_mixer[] = {
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Surround Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x16, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
+static struct hda_verb alc880_test_init_verbs[] = {
+        /* Unmute inputs of 0x0c - 0x0f */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        /* Vol output for 0x0c-0x0f */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* Set output pins 0x14-0x17 */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* Unmute output pins 0x14-0x17 */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Set input pins 0x18-0x1c */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        /* Mute input pins 0x18-0x1b */
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* ADC set up */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* Analog input/passthru */
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        {0}
+};
+#endif
+
+/*
+ */
+
+static struct hda_board_config alc880_cfg_tbl[] = {
+        /* Back 3 jack, front 2 jack */
+        { .modelname = "3stack", .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe200, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe201, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe202, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe203, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe204, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe205, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe206, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe207, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe208, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe209, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20a, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20b, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20c, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20d, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20e, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20f, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe210, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe211, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe214, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe302, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe303, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe304, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe306, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe307, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe404, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xa101, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x3031, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4036, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4037, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4038, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4040, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4041, .config = ALC880_3ST },
+        /* TCL S700 */
+        { .pci_subvendor = 0x19db, .pci_subdevice = 0x4188, .config = ALC880_TCL_S700 },
+
+        /* Back 3 jack, front 2 jack (Internal add Aux-In) */
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0xe310, .config = ALC880_3ST },
+        { .pci_subvendor = 0x104d, .pci_subdevice = 0x81d6, .config = ALC880_3ST }, 
+        { .pci_subvendor = 0x104d, .pci_subdevice = 0x81a0, .config = ALC880_3ST },
+
+        /* Back 3 jack plus 1 SPDIF out jack, front 2 jack */
+        { .modelname = "3stack-digout", .config = ALC880_3ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe308, .config = ALC880_3ST_DIG },
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0x0070, .config = ALC880_3ST_DIG },
+        /* Clevo m520G NB */
+        { .pci_subvendor = 0x1558, .pci_subdevice = 0x0520, .config = ALC880_CLEVO },
+
+        /* Back 3 jack plus 1 SPDIF out jack, front 2 jack (Internal add Aux-In)*/
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe305, .config = ALC880_3ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd402, .config = ALC880_3ST_DIG },
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0xe309, .config = ALC880_3ST_DIG },
+
+        /* Back 5 jack, front 2 jack */
+        { .modelname = "5stack", .config = ALC880_5ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x3033, .config = ALC880_5ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4039, .config = ALC880_5ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x3032, .config = ALC880_5ST },
+        { .pci_subvendor = 0x103c, .pci_subdevice = 0x2a09, .config = ALC880_5ST },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x814e, .config = ALC880_5ST },
+
+        /* Back 5 jack plus 1 SPDIF out jack, front 2 jack */
+        { .modelname = "5stack-digout", .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe224, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe400, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe401, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe402, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd400, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd401, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xa100, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x1565, .pci_subdevice = 0x8202, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x1019, .pci_subdevice = 0xa880, .config = ALC880_5ST_DIG },
+        /* { .pci_subvendor = 0x1019, .pci_subdevice = 0xa884, .config = ALC880_5ST_DIG }, */ /* conflict with 6stack */
+        { .pci_subvendor = 0x1695, .pci_subdevice = 0x400d, .config = ALC880_5ST_DIG },
+        /* note subvendor = 0 below */
+        /* { .pci_subvendor = 0x0000, .pci_subdevice = 0x8086, .config = ALC880_5ST_DIG }, */
+
+        { .modelname = "w810", .config = ALC880_W810 },
+        { .pci_subvendor = 0x161f, .pci_subdevice = 0x203d, .config = ALC880_W810 },
+
+        { .modelname = "z71v", .config = ALC880_Z71V },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_Z71V },
+
+        { .modelname = "6stack", .config = ALC880_6ST },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x8196, .config = ALC880_6ST }, /* ASUS P5GD1-HVM */
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x81b4, .config = ALC880_6ST },
+        { .pci_subvendor = 0x1019, .pci_subdevice = 0xa884, .config = ALC880_6ST }, /* Acer APFV */
+
+        { .modelname = "6stack-digout", .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x2668, .pci_subdevice = 0x8086, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0x2668, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x1462, .pci_subdevice = 0x1150, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0xe803, .pci_subdevice = 0x1019, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x1039, .pci_subdevice = 0x1234, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0x0077, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0x0078, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0x0087, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x1297, .pci_subdevice = 0xc790, .config = ALC880_6ST_DIG }, /* Shuttle ST20G5 */
+
+        { .modelname = "asus", .config = ALC880_ASUS },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1973, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x19b3, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1113, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1173, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1993, .config = ALC880_ASUS },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x10c3, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1133, .config = ALC880_ASUS },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1123, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1143, .config = ALC880_ASUS },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x10b3, .config = ALC880_ASUS_W1V },
+        { .pci_subvendor = 0x1558, .pci_subdevice = 0x5401, .config = ALC880_ASUS_DIG2 },
+
+        { .modelname = "uniwill", .config = ALC880_UNIWILL_DIG },
+        { .pci_subvendor = 0x1584, .pci_subdevice = 0x9050, .config = ALC880_UNIWILL_DIG },     
+
+        { .modelname = "F1734", .config = ALC880_F1734 },
+        { .pci_subvendor = 0x1734, .pci_subdevice = 0x107c, .config = ALC880_F1734 },
+        { .pci_subvendor = 0x1584, .pci_subdevice = 0x9054, .config = ALC880_F1734 },
+
+#ifdef CONFIG_SND_DEBUG
+        { .modelname = "test", .config = ALC880_TEST },
+#endif
+        { .modelname = "auto", .config = ALC880_AUTO },
+
+        {0}
+};
+
+/*
+ * ALC880 codec presets
+ */
+static struct alc_config_preset alc880_presets[] = {
+        [ALC880_3ST] = {
+                .mixers = { alc880_three_stack_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_3stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+                .dac_nids = alc880_dac_nids,
+                .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
+                .channel_mode = alc880_threestack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_3ST_DIG] = {
+                .mixers = { alc880_three_stack_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_3stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+                .dac_nids = alc880_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
+                .channel_mode = alc880_threestack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_TCL_S700] = {
+                .mixers = { alc880_tcl_s700_mixer },
+                .init_verbs = { alc880_volume_init_verbs,
+                                alc880_pin_tcl_S700_init_verbs,
+                                alc880_gpio2_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+                .dac_nids = alc880_dac_nids,
+                .hp_nid = 0x03,
+                .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
+                .channel_mode = alc880_2_jack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_5ST] = {
+                .mixers = { alc880_three_stack_mixer, alc880_five_stack_mixer},
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_5stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+                .dac_nids = alc880_dac_nids,
+                .num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes),
+                .channel_mode = alc880_fivestack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_5ST_DIG] = {
+                .mixers = { alc880_three_stack_mixer, alc880_five_stack_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_5stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+                .dac_nids = alc880_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes),
+                .channel_mode = alc880_fivestack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_6ST] = {
+                .mixers = { alc880_six_stack_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_6st_dac_nids),
+                .dac_nids = alc880_6st_dac_nids,
+                .num_channel_mode = ARRAY_SIZE(alc880_sixstack_modes),
+                .channel_mode = alc880_sixstack_modes,
+                .input_mux = &alc880_6stack_capture_source,
+        },
+        [ALC880_6ST_DIG] = {
+                .mixers = { alc880_six_stack_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_6st_dac_nids),
+                .dac_nids = alc880_6st_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_sixstack_modes),
+                .channel_mode = alc880_sixstack_modes,
+                .input_mux = &alc880_6stack_capture_source,
+        },
+        [ALC880_W810] = {
+                .mixers = { alc880_w810_base_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_w810_init_verbs,
+                                alc880_gpio2_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_w810_dac_nids),
+                .dac_nids = alc880_w810_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_w810_modes),
+                .channel_mode = alc880_w810_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_Z71V] = {
+                .mixers = { alc880_z71v_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_z71v_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_z71v_dac_nids),
+                .dac_nids = alc880_z71v_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .hp_nid = 0x03,
+                .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
+                .channel_mode = alc880_2_jack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_F1734] = {
+                .mixers = { alc880_f1734_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_f1734_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_f1734_dac_nids),
+                .dac_nids = alc880_f1734_dac_nids,
+                .hp_nid = 0x02,
+                .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
+                .channel_mode = alc880_2_jack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_ASUS] = {
+                .mixers = { alc880_asus_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+                                alc880_gpio1_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+                .dac_nids = alc880_asus_dac_nids,
+                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+                .channel_mode = alc880_asus_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_ASUS_DIG] = {
+                .mixers = { alc880_asus_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+                                alc880_gpio1_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+                .dac_nids = alc880_asus_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+                .channel_mode = alc880_asus_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_ASUS_DIG2] = {
+                .mixers = { alc880_asus_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+                                alc880_gpio2_init_verbs }, /* use GPIO2 */
+                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+                .dac_nids = alc880_asus_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+                .channel_mode = alc880_asus_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_ASUS_W1V] = {
+                .mixers = { alc880_asus_mixer, alc880_asus_w1v_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+                                alc880_gpio1_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+                .dac_nids = alc880_asus_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+                .channel_mode = alc880_asus_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_UNIWILL_DIG] = {
+                .mixers = { alc880_asus_mixer, alc880_pcbeep_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+                .dac_nids = alc880_asus_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+                .channel_mode = alc880_asus_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_CLEVO] = {
+                .mixers = { alc880_three_stack_mixer },
+                .init_verbs = { alc880_volume_init_verbs,
+                                alc880_pin_clevo_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+                .dac_nids = alc880_dac_nids,
+                .hp_nid = 0x03,
+                .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
+                .channel_mode = alc880_threestack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+#ifdef CONFIG_SND_DEBUG
+        [ALC880_TEST] = {
+                .mixers = { alc880_test_mixer },
+                .init_verbs = { alc880_test_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_test_dac_nids),
+                .dac_nids = alc880_test_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_test_modes),
+                .channel_mode = alc880_test_modes,
+                .input_mux = &alc880_test_capture_source,
+        },
+#endif
+};
+
+/*
+ * Automatic parse of I/O pins from the BIOS configuration
+ */
+
+#define NUM_CONTROL_ALLOC       32
+#define NUM_VERB_ALLOC          32
+
+enum {
+        ALC_CTL_WIDGET_VOL,
+        ALC_CTL_WIDGET_MUTE,
+        ALC_CTL_BIND_MUTE,
+};
+static struct snd_kcontrol_new alc880_control_templates[] = {
+        HDA_CODEC_VOLUME(NULL, 0, 0, 0),
+        HDA_CODEC_MUTE(NULL, 0, 0, 0),
+        HDA_BIND_MUTE(NULL, 0, 0, 0),
+};
+
+/* add dynamic controls */
+static int add_control(struct alc_spec *spec, int type, const char *name, unsigned long val)
+{
+        struct snd_kcontrol_new *knew;
+
+        if (spec->num_kctl_used >= spec->num_kctl_alloc) {
+                int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC;
+
+                knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */
+                if (! knew)
+                        return -ENOMEM;
+                if (spec->kctl_alloc) {
+                        memcpy(knew, spec->kctl_alloc, sizeof(*knew) * spec->num_kctl_alloc);
+                        kfree(spec->kctl_alloc);
+                }
+                spec->kctl_alloc = knew;
+                spec->num_kctl_alloc = num;
+        }
+
+        knew = &spec->kctl_alloc[spec->num_kctl_used];
+        *knew = alc880_control_templates[type];
+        knew->name = kstrdup(name, GFP_KERNEL);
+        if (! knew->name)
+                return -ENOMEM;
+        knew->private_value = val;
+        spec->num_kctl_used++;
+        return 0;
+}
+
+#define alc880_is_fixed_pin(nid)        ((nid) >= 0x14 && (nid) <= 0x17)
+#define alc880_fixed_pin_idx(nid)       ((nid) - 0x14)
+#define alc880_is_multi_pin(nid)        ((nid) >= 0x18)
+#define alc880_multi_pin_idx(nid)       ((nid) - 0x18)
+#define alc880_is_input_pin(nid)        ((nid) >= 0x18)
+#define alc880_input_pin_idx(nid)       ((nid) - 0x18)
+#define alc880_idx_to_dac(nid)          ((nid) + 0x02)
+#define alc880_dac_to_idx(nid)          ((nid) - 0x02)
+#define alc880_idx_to_mixer(nid)        ((nid) + 0x0c)
+#define alc880_idx_to_selector(nid)     ((nid) + 0x10)
+#define ALC880_PIN_CD_NID               0x1c
+
+/* fill in the dac_nids table from the parsed pin configuration */
+static int alc880_auto_fill_dac_nids(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
+{
+        hda_nid_t nid;
+        int assigned[4];
+        int i, j;
+
+        memset(assigned, 0, sizeof(assigned));
+        spec->multiout.dac_nids = spec->private_dac_nids;
+
+        /* check the pins hardwired to audio widget */
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = cfg->line_out_pins[i];
+                if (alc880_is_fixed_pin(nid)) {
+                        int idx = alc880_fixed_pin_idx(nid);
+                        spec->multiout.dac_nids[i] = alc880_idx_to_dac(idx);
+                        assigned[idx] = 1;
+                }
+        }
+        /* left pins can be connect to any audio widget */
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = cfg->line_out_pins[i];
+                if (alc880_is_fixed_pin(nid))
+                        continue;
+                /* search for an empty channel */
+                for (j = 0; j < cfg->line_outs; j++) {
+                        if (! assigned[j]) {
+                                spec->multiout.dac_nids[i] = alc880_idx_to_dac(j);
+                                assigned[j] = 1;
+                                break;
+                        }
+                }
+        }
+        spec->multiout.num_dacs = cfg->line_outs;
+        return 0;
+}
+
+/* add playback controls from the parsed DAC table */
+static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec,
+                                             const struct auto_pin_cfg *cfg)
+{
+        char name[32];
+        static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };
+        hda_nid_t nid;
+        int i, err;
+
+        for (i = 0; i < cfg->line_outs; i++) {
+                if (! spec->multiout.dac_nids[i])
+                        continue;
+                nid = alc880_idx_to_mixer(alc880_dac_to_idx(spec->multiout.dac_nids[i]));
+                if (i == 2) {
+                        /* Center/LFE */
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Center Playback Volume",
+                                               HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "LFE Playback Volume",
+                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "Center Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 1, 2, HDA_INPUT))) < 0)
+                                return err;
+                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "LFE Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 2, 2, HDA_INPUT))) < 0)
+                                return err;
+                } else {
+                        sprintf(name, "%s Playback Volume", chname[i]);
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        sprintf(name, "%s Playback Switch", chname[i]);
+                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
+                                               HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0)
+                                return err;
+                }
+        }
+        return 0;
+}
+
+/* add playback controls for speaker and HP outputs */
+static int alc880_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin,
+                                        const char *pfx)
+{
+        hda_nid_t nid;
+        int err;
+        char name[32];
+
+        if (! pin)
+                return 0;
+
+        if (alc880_is_fixed_pin(pin)) {
+                nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));
+                if (! spec->multiout.dac_nids[0]) {
+                        /* use this as the primary output */
+                        spec->multiout.dac_nids[0] = nid;
+                        if (! spec->multiout.num_dacs)
+                                spec->multiout.num_dacs = 1;
+                } else 
+                        /* specify the DAC as the extra output */
+                        spec->multiout.hp_nid = nid;
+                /* control HP volume/switch on the output mixer amp */
+                nid = alc880_idx_to_mixer(alc880_fixed_pin_idx(pin));
+                sprintf(name, "%s Playback Volume", pfx);
+                if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                                       HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                        return err;
+                sprintf(name, "%s Playback Switch", pfx);
+                if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
+                                       HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0)
+                        return err;
+        } else if (alc880_is_multi_pin(pin)) {
+                /* set manual connection */
+                if (! spec->multiout.dac_nids[0]) {
+                        /* use this as the primary output */
+                        spec->multiout.dac_nids[0] = alc880_idx_to_dac(alc880_multi_pin_idx(pin));
+                        if (! spec->multiout.num_dacs)
+                                spec->multiout.num_dacs = 1;
+                }
+                /* we have only a switch on HP-out PIN */
+                sprintf(name, "%s Playback Switch", pfx);
+                if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+                                       HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT))) < 0)
+                        return err;
+        }
+        return 0;
+}
+
+/* create input playback/capture controls for the given pin */
+static int new_analog_input(struct alc_spec *spec, hda_nid_t pin, const char *ctlname,
+                            int idx, hda_nid_t mix_nid)
+{
+        char name[32];
+        int err;
+
+        sprintf(name, "%s Playback Volume", ctlname);
+        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                               HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT))) < 0)
+                return err;
+        sprintf(name, "%s Playback Switch", ctlname);
+        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+                               HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT))) < 0)
+                return err;
+        return 0;
+}
+
+/* create playback/capture controls for input pins */
+static int alc880_auto_create_analog_input_ctls(struct alc_spec *spec,
+                                                const struct auto_pin_cfg *cfg)
+{
+        struct hda_input_mux *imux = &spec->private_imux;
+        int i, err, idx;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                if (alc880_is_input_pin(cfg->input_pins[i])) {
+                        idx = alc880_input_pin_idx(cfg->input_pins[i]);
+                        err = new_analog_input(spec, cfg->input_pins[i],
+                                               auto_pin_cfg_labels[i],
+                                               idx, 0x0b);
+                        if (err < 0)
+                                return err;
+                        imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
+                        imux->items[imux->num_items].index = alc880_input_pin_idx(cfg->input_pins[i]);
+                        imux->num_items++;
+                }
+        }
+        return 0;
+}
+
+static void alc880_auto_set_output_and_unmute(struct hda_codec *codec,
+                                              hda_nid_t nid, int pin_type,
+                                              int dac_idx)
+{
+        /* set as output */
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+        /* need the manual connection? */
+        if (alc880_is_multi_pin(nid)) {
+                struct alc_spec *spec = codec->spec;
+                int idx = alc880_multi_pin_idx(nid);
+                snd_hda_codec_write(codec, alc880_idx_to_selector(idx), 0,
+                                    AC_VERB_SET_CONNECT_SEL,
+                                    alc880_dac_to_idx(spec->multiout.dac_nids[dac_idx]));
+        }
+}
+
+static void alc880_auto_init_multi_out(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < spec->autocfg.line_outs; i++) {
+                hda_nid_t nid = spec->autocfg.line_out_pins[i];
+                alc880_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
+        }
+}
+
+static void alc880_auto_init_extra_out(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t pin;
+
+        pin = spec->autocfg.speaker_pin;
+        if (pin) /* connect to front */
+                alc880_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
+        pin = spec->autocfg.hp_pin;
+        if (pin) /* connect to front */
+                alc880_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
+}
+
+static void alc880_auto_init_analog_input(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                hda_nid_t nid = spec->autocfg.input_pins[i];
+                if (alc880_is_input_pin(nid)) {
+                        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                            i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+                        if (nid != ALC880_PIN_CD_NID)
+                                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                                    AMP_OUT_MUTE);
+                }
+        }
+}
+
+/* parse the BIOS configuration and set up the alc_spec */
+/* return 1 if successful, 0 if the proper config is not found, or a negative error code */
+static int alc880_parse_auto_config(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int err;
+        static hda_nid_t alc880_ignore[] = { 0x1d, 0 };
+
+        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
+                                                alc880_ignore)) < 0)
+                return err;
+        if (! spec->autocfg.line_outs && ! spec->autocfg.speaker_pin &&
+            ! spec->autocfg.hp_pin)
+                return 0; /* can't find valid BIOS pin config */
+
+        if ((err = alc880_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 ||
+            (err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+            (err = alc880_auto_create_extra_out(spec, spec->autocfg.speaker_pin,
+                                                "Speaker")) < 0 ||
+            (err = alc880_auto_create_extra_out(spec, spec->autocfg.speaker_pin,
+                                                "Headphone")) < 0 ||
+            (err = alc880_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+                return err;
+
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+        if (spec->autocfg.dig_out_pin)
+                spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
+        if (spec->autocfg.dig_in_pin)
+                spec->dig_in_nid = ALC880_DIGIN_NID;
+
+        if (spec->kctl_alloc)
+                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+        spec->init_verbs[spec->num_init_verbs++] = alc880_volume_init_verbs;
+
+        spec->input_mux = &spec->private_imux;
+
+        return 1;
+}
+
+/* init callback for auto-configuration model -- overriding the default init */
+static int alc880_auto_init(struct hda_codec *codec)
+{
+        alc_init(codec);
+        alc880_auto_init_multi_out(codec);
+        alc880_auto_init_extra_out(codec);
+        alc880_auto_init_analog_input(codec);
+        return 0;
+}
+
+/*
+ * OK, here we have finally the patch for ALC880
+ */
+
+static int patch_alc880(struct hda_codec *codec)
+{
+        struct alc_spec *spec;
+        int board_config;
+        int err;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;
+
+        board_config = snd_hda_check_board_config(codec, alc880_cfg_tbl);
+        if (board_config < 0 || board_config >= ALC880_MODEL_LAST) {
+                printk(KERN_INFO "hda_codec: Unknown model for ALC880, trying auto-probe from BIOS...\n");
+                board_config = ALC880_AUTO;
+        }
+
+        if (board_config == ALC880_AUTO) {
+                /* automatic parse from the BIOS config */
+                err = alc880_parse_auto_config(codec);
+                if (err < 0) {
+                        alc_free(codec);
+                        return err;
+                } else if (! err) {
+                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using 3-stack mode...\n");
+                        board_config = ALC880_3ST;
+                }
+        }
+
+        if (board_config != ALC880_AUTO)
+                setup_preset(spec, &alc880_presets[board_config]);
+
+        spec->stream_name_analog = "ALC880 Analog";
+        spec->stream_analog_playback = &alc880_pcm_analog_playback;
+        spec->stream_analog_capture = &alc880_pcm_analog_capture;
+
+        spec->stream_name_digital = "ALC880 Digital";
+        spec->stream_digital_playback = &alc880_pcm_digital_playback;
+        spec->stream_digital_capture = &alc880_pcm_digital_capture;
+
+        if (! spec->adc_nids && spec->input_mux) {
+                /* check whether NID 0x07 is valid */
+                unsigned int wcap = get_wcaps(codec, alc880_adc_nids[0]);
+                wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
+                if (wcap != AC_WID_AUD_IN) {
+                        spec->adc_nids = alc880_adc_nids_alt;
+                        spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids_alt);
+                        spec->mixers[spec->num_mixers] = alc880_capture_alt_mixer;
+                        spec->num_mixers++;
+                } else {
+                        spec->adc_nids = alc880_adc_nids;
+                        spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids);
+                        spec->mixers[spec->num_mixers] = alc880_capture_mixer;
+                        spec->num_mixers++;
+                }
+        }
+
+        codec->patch_ops = alc_patch_ops;
+        if (board_config == ALC880_AUTO)
+                codec->patch_ops.init = alc880_auto_init;
+
+        return 0;
+}
+
+
+/*
+ * ALC260 support
+ */
+
+static hda_nid_t alc260_dac_nids[1] = {
+        /* front */
+        0x02,
+};
+
+static hda_nid_t alc260_adc_nids[1] = {
+        /* ADC0 */
+        0x04,
+};
+
+static hda_nid_t alc260_adc_nids_alt[1] = {
+        /* ADC1 */
+        0x05,
+};
+
+static hda_nid_t alc260_hp_adc_nids[2] = {
+        /* ADC1, 0 */
+        0x05, 0x04
+};
+
+#define ALC260_DIGOUT_NID       0x03
+#define ALC260_DIGIN_NID        0x06
+
+static struct hda_input_mux alc260_capture_source = {
+        .num_items = 4,
+        .items = {
+                { "Mic", 0x0 },
+                { "Front Mic", 0x1 },
+                { "Line", 0x2 },
+                { "CD", 0x4 },
+        },
+};
+
+/* On Fujitsu S702x laptops capture only makes sense from Mic/LineIn jack
+ * and the internal CD lines.
+ */
+static struct hda_input_mux alc260_fujitsu_capture_source = {
+        .num_items = 2,
+        .items = {
+                { "Mic/Line", 0x0 },
+                { "CD", 0x4 },
+        },
+};
+
+/*
+ * This is just place-holder, so there's something for alc_build_pcms to look
+ * at when it calculates the maximum number of channels. ALC260 has no mixer
+ * element which allows changing the channel mode, so the verb list is
+ * never used.
+ */
+static struct hda_channel_mode alc260_modes[1] = {
+        { 2, NULL },
+};
+
+
+/* Mixer combinations
+ *
+ * basic: base_output + input + pc_beep + capture
+ * HP: base_output + input + capture_alt
+ * HP_3013: hp_3013 + input + capture
+ * fujitsu: fujitsu + capture
+ */
+
+static struct snd_kcontrol_new alc260_base_output_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x09, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Headphone Playback Switch", 0x09, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
+        {0} /* end */
+};      
+
+static struct snd_kcontrol_new alc260_input_mixer[] = {
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x07, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x07, 0x01, HDA_INPUT),
+        {0} /* end */
+};
+
+static struct snd_kcontrol_new alc260_pc_beep_mixer[] = {
+        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x07, 0x05, HDA_INPUT),
+        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x07, 0x05, HDA_INPUT),
+        {0} /* end */
+};
+
+static struct snd_kcontrol_new alc260_hp_3013_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x09, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Front Playback Switch", 0x10, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Aux-In Playback Volume", 0x07, 0x06, HDA_INPUT),
+        HDA_CODEC_MUTE("Aux-In Playback Switch", 0x07, 0x06, HDA_INPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("iSpeaker Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("iSpeaker Playback Switch", 0x11, 1, 0x0, HDA_OUTPUT),
+        {0} /* end */
+};
+
+static struct snd_kcontrol_new alc260_fujitsu_mixer[] = {
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Headphone Playback Switch", 0x08, 2, HDA_INPUT),
+        ALC_PINCTL_SWITCH("Headphone Amp Switch", 0x14, PIN_HP_AMP),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic/Line Playback Volume", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic/Line Playback Switch", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
+        HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Speaker Playback Volume", 0x09, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Internal Speaker Playback Switch", 0x09, 2, HDA_INPUT),
+        {0} /* end */
+};
+
+/* capture mixer elements */
+static struct snd_kcontrol_new alc260_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x04, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x04, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x05, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x05, 0x0, HDA_INPUT),
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 /* The multiple "Capture Source" controls confuse alsamixer
                  * So call somewhat different..
@@ -565 +2433 @@
                  */
                 /* .name = "Capture Source", */
-                /*.name = */"Input Source",0,0,
-                /*.count = */3,
-                /*.info = */alc_mux_enum_info,
-                /*.get = */alc_mux_enum_get,
-                /*.put = */alc_mux_enum_put,0
+                .name = "Input Source",
+                .count = 2,
+                .info = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
         },
         {0} /* end */
 };
 
-static snd_kcontrol_new_t alc880_z71v_mixer[] = {
-    ALC_BIND_VOL("Front Playback Volume", 0x0c, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-    ALC_BIND_VOL("Headphone Playback Volume", 0x0d, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
-    HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-    HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
-    {
-        /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /* The multiple "Capture Source" controls confuse alsamixer
-         * So call somewhat different..
-         * FIXME: the controls appear in the "playback" view!
-         */
-        /* .name = */"Capture Source",0,0,
-//        /*.name = */"Input Source",0,0,
-        /*.count = */3,
-        /*.info = */alc_mux_enum_info,
-        /*.get = */alc_mux_enum_get,
-        /*.put = */alc_mux_enum_put,0
-    },
-    {0} /* end */
-};
-
-/*
- */
-static int alc_build_controls(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        int err;
-        int i;
-
-        for (i = 0; i < spec->num_mixers; i++) {
-                err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
-                if (err < 0)
-                        return err;
-        }
-
-        if (spec->multiout.dig_out_nid) {
-                err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
-                if (err < 0)
-                        return err;
-        }
-        if (spec->dig_in_nid) {
-            err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
-            if (err < 0)
-                return err;
-        }
-        return 0;
-}
-
-/*
- * initialize the codec volumes, etc
- */
-
-static struct hda_verb alc880_init_verbs_three_stack[] = {
-        /* Line In pin widget for input */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* CD pin widget for input */
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* Mic2 (front panel) pin widget for input and vref at 80% */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* unmute amp left and right */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* set connection select to mic in */
-        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* unmute amp left and right */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* set connection select to mic in */
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* unmute amp left and right */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* set connection select to mic in */
-        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* unmute front mixer amp left (volume = 0) */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* unmute rear mixer amp left and right (volume = 0) */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* unmute rear mixer amp left and right (volume = 0) */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-
-        /* using rear surround as the path for headphone output */
-        /* unmute rear surround mixer amp left and right (volume = 0) */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* PASD 3 stack boards use the Mic 2 as the headphone output */
-        /* need to program the selector associated with the Mic 2 pin widget to
-         * surround path (index 0x01) for headphone output */
-        {0x11, AC_VERB_SET_CONNECT_SEL, 0x01},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* need to retask the Mic 2 pin widget to output */
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) for mixer widget(nid=0x0B)
-         * to support the input path of analog loopback
-         * Note: PASD motherboards uses the Line In 2 as the input for front panel
-         * mic (mic 2)
-         */
-        /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
-        /* unmute CD */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
-        /* unmute Line In */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
-        /* unmute Mic 1 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        /* unmute Line In 2 (for PASD boards Mic 2) */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))},
-
-        /* Unmute input amps for the line out paths to support the output path of
-         * analog loopback
-         * the mixers on the output path has 2 inputs, one from the DAC and one
-         * from the mixer
-         */
-        /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
-        /* Unmute Front out path */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Surround (used as HP) out path */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute C/LFE out path */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))}, /* mute */
-        /* Unmute rear Surround out path */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-
-        {0}
-};
-
-static struct hda_verb alc880_init_verbs_five_stack[] = {
-        /* Line In pin widget for input */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* CD pin widget for input */
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* Mic2 (front panel) pin widget for input and vref at 80% */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* unmute amp left and right */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* set connection select to mic in */
-        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* unmute amp left and right */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* set connection select to mic in */
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* unmute amp left and right */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* set connection select to mic in */
-        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* unmute front mixer amp left and right (volume = 0) */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* five rear and clfe */
-        /* unmute rear mixer amp left and right (volume = 0)  */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* unmute clfe mixer amp left and right (volume = 0) */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-
-        /* using rear surround as the path for headphone output */
-        /* unmute rear surround mixer amp left and right (volume = 0) */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* PASD 3 stack boards use the Mic 2 as the headphone output */
-        /* need to program the selector associated with the Mic 2 pin widget to
-         * surround path (index 0x01) for headphone output
-         */
-        {0x11, AC_VERB_SET_CONNECT_SEL, 0x01},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* need to retask the Mic 2 pin widget to output */
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) for mixer
-         * widget(nid=0x0B) to support the input path of analog loopback
-         */
-        /* Note: PASD motherboards uses the Line In 2 as the input for front panel mic (mic 2) */
-        /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03*/
-        /* unmute CD */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
-        /* unmute Line In */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
-        /* unmute Mic 1 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        /* unmute Line In 2 (for PASD boards Mic 2) */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))},
-
-        /* Unmute input amps for the line out paths to support the output path of
-         * analog loopback
-         * the mixers on the output path has 2 inputs, one from the DAC and
-         * one from the mixer
-         */
-        /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
-        /* Unmute Front out path */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Surround (used as HP) out path */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute C/LFE out path */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))}, /* mute */
-        /* Unmute rear Surround out path */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-
-        {0}
-};
-
-static struct hda_verb alc880_w810_init_verbs[] = {
-        /* front channel selector/amp: input 0: DAC: unmuted, (no volume selection) */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-
-        /* front channel selector/amp: input 1: capture mix: muted, (no volume selection) */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7180},
-
-        /* front channel selector/amp: output 0: unmuted, max volume */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-
-        /* front out pin: muted, (no volume selection)  */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-
-        /* front out pin: NOT headphone enable, out enable, vref disabled */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-
-
-        /* surround channel selector/amp: input 0: DAC: unmuted, (no volume selection) */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-
-        /* surround channel selector/amp: input 1: capture mix: muted, (no volume selection) */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7180},
-
-        /* surround channel selector/amp: output 0: unmuted, max volume */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-
-        /* surround out pin: muted, (no volume selection)  */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-
-        /* surround out pin: NOT headphone enable, out enable, vref disabled */
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-
-
-        /* c/lfe channel selector/amp: input 0: DAC: unmuted, (no volume selection) */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-
-        /* c/lfe channel selector/amp: input 1: capture mix: muted, (no volume selection) */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0x7180},
-
-        /* c/lfe channel selector/amp: output 0: unmuted, max volume */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-
-        /* c/lfe out pin: muted, (no volume selection)  */
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-
-        /* c/lfe out pin: NOT headphone enable, out enable, vref disabled */
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-
-
-        /* hphone/speaker input selector: front DAC */
-        {0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
-
-        /* hphone/speaker out pin: muted, (no volume selection)  */
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-
-        /* hphone/speaker out pin: NOT headphone enable, out enable, vref disabled */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-
-
-        {0}
-};
-
-static struct hda_verb alc880_z71v_init_verbs[] = {
-    /* front channel selector/amp: input 0: DAC: unmuted, (no volume selection) */
-    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    /* front channel selector/amp: input 1: capture mix: muted, (no volume selection) */
-    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7180},
-    /* front channel selector/amp: output 0: unmuted, max volume */
-    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    /* front out pin: muted, (no volume selection)  */
-    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    /* front out pin: NOT headphone enable, out enable, vref disabled */
-    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-    /* headphone channel selector/amp: input 0: DAC: unmuted, (no volume selection) */
-    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    /* headphone channel selector/amp: input 1: capture mix: muted, (no volume selection) */
-    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7180},
-    /* headphone channel selector/amp: output 0: unmuted, max volume */
-    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    /* headphone out pin: muted, (no volume selection)  */
-    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    /* headpohne out pin: headphone enable, out enable, vref disabled */
-    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
-
-    /* Line In pin widget for input */
-    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-    /* CD pin widget for input */
-    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-    /* Mic1 (rear panel) pin widget for input and vref at 80% */
-    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-    /* Mic2 (front panel) pin widget for input and vref at 80% */
-    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-    /* unmute amp left and right */
-    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    /* set connection select to mic in */
-    {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-    /* unmute amp left and right */
-    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    /* set connection select to mic in */
-    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-    /* unmute amp left and right */
-    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    /* set connection select to mic in */
-    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-    /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) for mixer
-     * widget(nid=0x0B) to support the input path of analog loopback
-     */
-    /* Note: PASD motherboards uses the Line In 2 as the input for front panel mic (mic 2) */
-    /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03*/
-    /* unmute CD */
-    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
-    /* unmute Line In */
-    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
-    /* unmute Mic 1 */
-    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-    /* unmute Line In 2 (for PASD boards Mic 2) */
-    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))},
-
-    {0}
-};
-
-static int alc_init(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        snd_hda_sequence_write(codec, spec->init_verbs);
-        return 0;
-}
-
-#ifdef CONFIG_PM
-/*
- * resume
- */
-static int alc_resume(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        int i;
-
-        alc_init(codec);
-        for (i = 0; i < spec->num_mixers; i++) {
-                snd_hda_resume_ctls(codec, spec->mixers[i]);
-        }
-        if (spec->multiout.dig_out_nid)
-            snd_hda_resume_spdif_out(codec);
-        if (spec->dig_in_nid)
-            snd_hda_resume_spdif_in(codec);
-        return 0;
-}
-#endif
-
-/*
- * Analog playback callbacks
- */
-static int alc880_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                    struct hda_codec *codec,
-                                    snd_pcm_substream_t *substream)
-{
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
-}
-
-static int alc880_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                       struct hda_codec *codec,
-                                       unsigned int stream_tag,
-                                       unsigned int format,
-                                       snd_pcm_substream_t *substream)
-{
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
-                                                format, substream);
-}
-
-static int alc880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                       struct hda_codec *codec,
-                                       snd_pcm_substream_t *substream)
-{
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
-}
-
-/*
- * Digital out
- */
-static int alc880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        snd_pcm_substream_t *substream)
-{
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
-}
-
-static int alc880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
-                                         struct hda_codec *codec,
-                                         snd_pcm_substream_t *substream)
-{
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
-}
-
-/*
- * Analog capture
- */
-static int alc880_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      unsigned int stream_tag,
-                                      unsigned int format,
-                                      snd_pcm_substream_t *substream)
-{
-        struct alc_spec *spec = codec->spec;
-
-        snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
-                                   stream_tag, 0, format);
-        return 0;
-}
-
-static int alc880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      snd_pcm_substream_t *substream)
-{
-        struct alc_spec *spec = codec->spec;
-
-        snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number], 0, 0, 0);
-        return 0;
-}
-
-
-/*
- */
-static struct hda_pcm_stream alc880_pcm_analog_playback = {
-        /*.substreams = */1,
-        /*.channels_min = */2,
-        /*.channels_max = */8,
-        /*.nid = */0x02, /* NID to query formats and rates */
-        0,0,0,
-        /*.ops = */{
-                /*.open = */alc880_playback_pcm_open,0,
-                /*.prepare = */alc880_playback_pcm_prepare,
-                /*.cleanup = */alc880_playback_pcm_cleanup
-        },
-};
-
-static struct hda_pcm_stream alc880_pcm_analog_capture = {
-        /*.substreams = */2,
-        /*.channels_min = */2,
-        /*.channels_max = */2,
-        /*.nid = */0x08, /* NID to query formats and rates
-                          * (0x07 might be broken on some devices)
-                          */
-        0,0,0,
-        /*.ops = */{
-            0,0,
-                /*.prepare = */alc880_capture_pcm_prepare,
-                /*.cleanup = */alc880_capture_pcm_cleanup
-        },
-};
-
-static struct hda_pcm_stream alc880_pcm_digital_playback = {
-        /*.substreams = */1,
-        /*.channels_min = */2,
-        /*.channels_max = */2,
-        /* NID is set in alc_build_pcms */
-        0,0,0,0,
-        /*.ops = */{
-                /*.open = */alc880_dig_playback_pcm_open,
-                /*.close = */alc880_dig_playback_pcm_close,0,0
-        },
-};
-
-static struct hda_pcm_stream alc880_pcm_digital_capture = {
-        /*.substreams = */1,
-        /*.channels_min = */2,
-        /*.channels_max = */2,
-        /* NID is set in alc_build_pcms */
-};
-
-static int alc_build_pcms(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        struct hda_pcm *info = spec->pcm_rec;
-        int i;
-
-        codec->num_pcms = 1;
-        codec->pcm_info = info;
-
-        info->name = spec->stream_name_analog;
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_analog_playback);
-        info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
-
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = 0;
-        for (i = 0; i < spec->num_channel_mode; i++) {
-                if (spec->channel_mode[i].channels > info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max) {
-                    info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->channel_mode[i].channels;
-                }
-        }
-
-        if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
-                codec->num_pcms++;
-                info++;
-                info->name = spec->stream_name_digital;
-                if (spec->multiout.dig_out_nid) {
-                        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_digital_playback);
-                        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
-                }
-                if (spec->dig_in_nid) {
-                        info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_digital_capture);
-                        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid;
-                }
-        }
-
-        return 0;
-}
-
-static void alc_free(struct hda_codec *codec)
-{
-        kfree(codec->spec);
-}
-
-/*
- */
-static struct hda_codec_ops alc_patch_ops = {
-        /*.build_controls = */alc_build_controls,
-        /*.build_pcms = */alc_build_pcms,
-        /*.init = */alc_init,
-        /*.free = */alc_free,0,
-#ifdef CONFIG_PM
-        0,
-        /*.resume = */alc_resume,
-#endif
-};
-
-/*
- * Test configuration for debugging
- *
- * Almost all inputs/outputs are enabled.  I/O pins can be configured via
- * enum controls.
- */
-#ifdef CONFIG_SND_DEBUG
-static hda_nid_t alc880_test_dac_nids[4] = {
-    0x02, 0x03, 0x04, 0x05
-};
-
-static struct hda_input_mux alc880_test_capture_source = {
-    .num_items = 5,
-    .items = {
-        { "In-1", 0x0 },
-        { "In-2", 0x1 },
-        { "In-3", 0x2 },
-        { "In-4", 0x3 },
-        { "CD", 0x4 },
-    },
-};
-
-static struct alc_channel_mode alc880_test_modes[4] = {
-    { 2, NULL },
-    { 4, NULL },
-    { 6, NULL },
-    { 8, NULL },
-};
-
-static int alc_test_pin_ctl_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{
-    static char *texts[] = {
-        "N/A", "Line Out", "HP Out",
-        "In Hi-Z", "In 50%", "In Grd", "In 80%", "In 100%"
-    };
-    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-    uinfo->count = 1;
-    uinfo->value.enumerated.items = 8;
-    if (uinfo->value.enumerated.item >= 8)
-        uinfo->value.enumerated.item = 7;
-    strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-    return 0;
-}
-
-static int alc_test_pin_ctl_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
-    unsigned int pin_ctl, item = 0;
-
-    pin_ctl = snd_hda_codec_read(codec, nid, 0,
-                                 AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-    if (pin_ctl & AC_PINCTL_OUT_EN) {
-        if (pin_ctl & AC_PINCTL_HP_EN)
-            item = 2;
-        else
-            item = 1;
-    } else if (pin_ctl & AC_PINCTL_IN_EN) {
-        switch (pin_ctl & AC_PINCTL_VREFEN) {
-        case AC_PINCTL_VREF_HIZ: item = 3; break;
-        case AC_PINCTL_VREF_50:  item = 4; break;
-        case AC_PINCTL_VREF_GRD: item = 5; break;
-        case AC_PINCTL_VREF_80:  item = 6; break;
-        case AC_PINCTL_VREF_100: item = 7; break;
-        }
-    }
-    ucontrol->value.enumerated.item[0] = item;
-    return 0;
-}
-
-static int alc_test_pin_ctl_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
-    static unsigned int ctls[] = {
-        0, AC_PINCTL_OUT_EN, AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN,
-        AC_PINCTL_IN_EN | AC_PINCTL_VREF_HIZ,
-        AC_PINCTL_IN_EN | AC_PINCTL_VREF_50,
-        AC_PINCTL_IN_EN | AC_PINCTL_VREF_GRD,
-        AC_PINCTL_IN_EN | AC_PINCTL_VREF_80,
-        AC_PINCTL_IN_EN | AC_PINCTL_VREF_100,
-    };
-    unsigned int old_ctl, new_ctl;
-
-    old_ctl = snd_hda_codec_read(codec, nid, 0,
-                                 AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-    new_ctl = ctls[ucontrol->value.enumerated.item[0]];
-    if (old_ctl != new_ctl) {
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, new_ctl);
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                            ucontrol->value.enumerated.item[0] >= 3 ? 0xb080 : 0xb000);
-        return 1;
-    }
-    return 0;
-}
-
-static int alc_test_pin_src_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{
-    static char *texts[] = {
-        "Front", "Surround", "CLFE", "Side"
-    };
-    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-    uinfo->count = 1;
-    uinfo->value.enumerated.items = 4;
-    if (uinfo->value.enumerated.item >= 4)
-        uinfo->value.enumerated.item = 3;
-    strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-    return 0;
-}
-
-static int alc_test_pin_src_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
-    unsigned int sel;
-
-    sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0);
-    ucontrol->value.enumerated.item[0] = sel & 3;
-    return 0;
-}
-
-static int alc_test_pin_src_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
-    unsigned int sel;
-
-    sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0) & 3;
-    if (ucontrol->value.enumerated.item[0] != sel) {
-        sel = ucontrol->value.enumerated.item[0] & 3;
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, sel);
-        return 1;
-    }
-    return 0;
-}
-
-#define PIN_CTL_TEST(xname,nid) {                       \
-    .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
-    .name = xname,                 \
-    .info = alc_test_pin_ctl_info, \
-    .get = alc_test_pin_ctl_get,   \
-    .put = alc_test_pin_ctl_put,   \
-    .private_value = nid           \
-    }
-
-#define PIN_SRC_TEST(xname,nid) {                       \
-    .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
-    .name = xname,                 \
-    .info = alc_test_pin_src_info, \
-    .get = alc_test_pin_src_get,   \
-    .put = alc_test_pin_src_put,   \
-    .private_value = nid           \
-    }
-
-static snd_kcontrol_new_t alc880_test_mixer[] = {
-    ALC_BIND_VOL("Front Playback Volume", 0x0c, 2, HDA_OUTPUT),
-    ALC_BIND_VOL("Surround Playback Volume", 0x0d, 2, HDA_OUTPUT),
-    ALC_BIND_VOL("CLFE Playback Volume", 0x0e, 2, HDA_OUTPUT),
-    ALC_BIND_VOL("Side Playback Volume", 0x0f, 2, HDA_OUTPUT),
-    PIN_CTL_TEST("Front Pin Mode", 0x14),
-    PIN_CTL_TEST("Surround Pin Mode", 0x15),
-    PIN_CTL_TEST("CLFE Pin Mode", 0x16),
-    PIN_CTL_TEST("Side Pin Mode", 0x17),
-    PIN_CTL_TEST("In-1 Pin Mode", 0x18),
-    PIN_CTL_TEST("In-2 Pin Mode", 0x19),
-    PIN_CTL_TEST("In-3 Pin Mode", 0x1a),
-    PIN_CTL_TEST("In-4 Pin Mode", 0x1b),
-    PIN_SRC_TEST("In-1 Pin Source", 0x18),
-    PIN_SRC_TEST("In-2 Pin Source", 0x19),
-    PIN_SRC_TEST("In-3 Pin Source", 0x1a),
-    PIN_SRC_TEST("In-4 Pin Source", 0x1b),
-    HDA_CODEC_VOLUME("In-1 Playback Volume", 0x0b, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE("In-1 Playback Switch", 0x0b, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME("In-2 Playback Volume", 0x0b, 0x1, HDA_INPUT),
-    HDA_CODEC_MUTE("In-2 Playback Switch", 0x0b, 0x1, HDA_INPUT),
-    HDA_CODEC_VOLUME("In-3 Playback Volume", 0x0b, 0x2, HDA_INPUT),
-    HDA_CODEC_MUTE("In-3 Playback Switch", 0x0b, 0x2, HDA_INPUT),
-    HDA_CODEC_VOLUME("In-4 Playback Volume", 0x0b, 0x3, HDA_INPUT),
-    HDA_CODEC_MUTE("In-4 Playback Switch", 0x0b, 0x3, HDA_INPUT),
-    HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x4, HDA_INPUT),
-    HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x4, HDA_INPUT),
-    HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
-    {
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "Input Source",
-        .count = 2,
-        .info = alc_mux_enum_info,
-        .get = alc_mux_enum_get,
-        .put = alc_mux_enum_put,
-    },
-    {
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "Channel Mode",
-        .info = alc880_ch_mode_info,
-        .get = alc880_ch_mode_get,
-        .put = alc880_ch_mode_put,
-        .private_value = ARRAY_SIZE(alc880_test_modes),
-    },
-    { } /* end */
-};
-
-static struct hda_verb alc880_test_init_verbs[] = {
-    /* Unmute inputs of 0x0c - 0x0f */
-    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7100},
-    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7100},
-    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0x7100},
-    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0x7100},
-    /* Vol output for 0x0c-0x0f */
-    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    /* Set output pins 0x14-0x17 */
-    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-    {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-    /* Unmute output pins 0x14-0x17 */
-    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    /* Set input pins 0x18-0x1c */
-    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24}, /* vref 80% */
-    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-    /* Mute input pins 0x18-0x1b */
-    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-    /* ADC set up */
-    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-    { }
-};
-#endif
-
-/*
- */
-
-static struct hda_board_config alc880_cfg_tbl[] = {
-        /* Back 3 jack, front 2 jack */
-        { "3stack", ALC880_3ST,0,0 },
-        { 0, ALC880_3ST, 0x8086, 0xe200 },
-        { 0, ALC880_3ST, 0x8086, 0xe201 },
-        { 0, ALC880_3ST, 0x8086, 0xe202 },
-        { 0, ALC880_3ST, 0x8086, 0xe203 },
-        { 0, ALC880_3ST, 0x8086, 0xe204 },
-        { 0, ALC880_3ST, 0x8086, 0xe205 },
-        { 0, ALC880_3ST, 0x8086, 0xe206 },
-        { 0, ALC880_3ST, 0x8086, 0xe207 },
-        { 0, ALC880_3ST, 0x8086, 0xe208 },
-        { 0, ALC880_3ST, 0x8086, 0xe209 },
-        { 0, ALC880_3ST, 0x8086, 0xe20a },
-        { 0, ALC880_3ST, 0x8086, 0xe20b },
-        { 0, ALC880_3ST, 0x8086, 0xe20c },
-        { 0, ALC880_3ST, 0x8086, 0xe20d },
-        { 0, ALC880_3ST, 0x8086, 0xe20e },
-        { 0, ALC880_3ST, 0x8086, 0xe20f },
-        { 0, ALC880_3ST, 0x8086, 0xe210 },
-        { 0, ALC880_3ST, 0x8086, 0xe211 },
-        { 0, ALC880_3ST, 0x8086, 0xe214 },
-        { 0, ALC880_3ST, 0x8086, 0xe302 },
-        { 0, ALC880_3ST, 0x8086, 0xe303 },
-        { 0, ALC880_3ST, 0x8086, 0xe304 },
-        { 0, ALC880_3ST, 0x8086, 0xe306 },
-        { 0, ALC880_3ST, 0x8086, 0xe307 },
-        { 0, ALC880_3ST, 0x8086, 0xe404 },
-        { 0, ALC880_3ST, 0x8086, 0xa101 },
-        { 0, ALC880_3ST, 0x107b, 0x3031 },
-        { 0, ALC880_3ST, 0x107b, 0x4036 },
-        { 0, ALC880_3ST, 0x107b, 0x4037 },
-        { 0, ALC880_3ST, 0x107b, 0x4038 },
-        { 0, ALC880_3ST, 0x107b, 0x4040 },
-        { 0, ALC880_3ST, 0x107b, 0x4041 },
-
-        /* Back 3 jack, front 2 jack (Internal add Aux-In) */
-        { 0, ALC880_3ST, 0x1025, 0xe310,  },
-
-        /* Back 3 jack plus 1 SPDIF out jack, front 2 jack */
-        { "3stack-digout", ALC880_3ST_DIG, 0, 0 },
-        { 0, ALC880_3ST_DIG, 0x8086, 0xe308 },
-
-        /* Back 3 jack plus 1 SPDIF out jack, front 2 jack (Internal add Aux-In)*/
-        { 0, ALC880_3ST_DIG, 0x8086, 0xe305 },
-        { 0, ALC880_3ST_DIG, 0x8086, 0xd402 },
-        { 0, ALC880_3ST_DIG, 0x1025, 0xe309 },
-
-        /* Back 5 jack, front 2 jack */
-        { "5stack", ALC880_5ST, 0, 0 },
-        { 0, ALC880_5ST, 0x107b, 0x3033 },
-        { 0, ALC880_5ST, 0x107b, 0x4039 },
-        { 0, ALC880_5ST, 0x107b, 0x3032 },
-        { 0, ALC880_5ST, 0x103c, 0x2a09 },
-
-        /* Back 5 jack plus 1 SPDIF out jack, front 2 jack */
-        { "5stack-digout", ALC880_5ST_DIG, 0, 0 },
-        { 0, ALC880_5ST_DIG, 0x8086, 0xe224 },
-        { 0, ALC880_5ST_DIG, 0x8086, 0xe400 },
-        { 0, ALC880_5ST_DIG, 0x8086, 0xe401 },
-        { 0, ALC880_5ST_DIG, 0x8086, 0xe402 },
-        { 0, ALC880_5ST_DIG, 0x8086, 0xd400 },
-        { 0, ALC880_5ST_DIG, 0x8086, 0xd401 },
-        { 0, ALC880_5ST_DIG, 0x8086, 0xa100 },
-        { 0, ALC880_5ST_DIG, 0x1565, 0x8202 },
-
-        { "w810", ALC880_W810, 0, 0 },
-        { 0, ALC880_W810, 0x161f, 0x203d },
-        { "z71v", ALC880_Z71V, 0, 0 },
-        { 0, ALC880_Z71V, 0x1043, 0x1964 },
-
-#ifdef CONFIG_SND_DEBUG
-        { .modelname = "test", .config = ALC880_TEST },
-#endif
-
-        {0}
-};
-
-static int patch_alc880(struct hda_codec *codec)
-{
-        struct alc_spec *spec;
-        int board_config;
-
-        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        init_MUTEX(&spec->bind_mutex);
-        codec->spec = spec;
-
-        board_config = snd_hda_check_board_config(codec, alc880_cfg_tbl);
-        if (board_config < 0) {
-                snd_printd(KERN_INFO "hda_codec: Unknown model for ALC880\n");
-                board_config = ALC880_MINIMAL;
-        }
-
-        switch (board_config) {
-        case ALC880_W810:
-                spec->mixers[spec->num_mixers] = alc880_w810_base_mixer;
-                spec->num_mixers++;
-                break;
-        case ALC880_5ST:
-        case ALC880_5ST_DIG:
-            spec->mixers[spec->num_mixers] = alc880_five_stack_mixer;
-            spec->num_mixers++;
-            break;
-        case ALC880_Z71V:
-            spec->mixers[spec->num_mixers] = alc880_z71v_mixer;
-            spec->num_mixers++;
-            break;
-#ifdef CONFIG_SND_DEBUG
-        case ALC880_TEST:
-            spec->mixers[spec->num_mixers] = alc880_test_mixer;
-            spec->num_mixers++;
-            break;
-#endif
-        default:
-                spec->mixers[spec->num_mixers] = alc880_base_mixer;
-                spec->num_mixers++;
-                break;
-        }
-
-        switch (board_config) {
-        case ALC880_3ST_DIG:
-        case ALC880_5ST_DIG:
-        case ALC880_W810:
-        case ALC880_Z71V:
-        case ALC880_TEST:
-                spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
-                break;
-        default:
-                break;
-        }
-
-        switch (board_config) {
-        case ALC880_3ST:
-        case ALC880_3ST_DIG:
-        case ALC880_5ST:
-        case ALC880_5ST_DIG:
-        case ALC880_W810:
-                spec->front_panel = 1;
-                break;
-        default:
-                break;
-        }
-
-        switch (board_config) {
-        case ALC880_5ST:
-        case ALC880_5ST_DIG:
-                spec->init_verbs = alc880_init_verbs_five_stack;
-                spec->channel_mode = alc880_fivestack_modes;
-                spec->num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes);
-                break;
-        case ALC880_W810:
-                spec->init_verbs = alc880_w810_init_verbs;
-                spec->channel_mode = alc880_w810_modes;
-                spec->num_channel_mode = ARRAY_SIZE(alc880_w810_modes);
-                break;
-        case ALC880_Z71V:
-            spec->init_verbs = alc880_z71v_init_verbs;
-            spec->channel_mode = alc880_z71v_modes;
-            spec->num_channel_mode = ARRAY_SIZE(alc880_z71v_modes);
-            break;
-#ifdef CONFIG_SND_DEBUG
-        case ALC880_TEST:
-            spec->init_verbs = alc880_test_init_verbs;
-            spec->channel_mode = alc880_test_modes;
-            spec->num_channel_mode = ARRAY_SIZE(alc880_test_modes);
-            break;
-#endif
-        default:
-                spec->init_verbs = alc880_init_verbs_three_stack;
-                spec->channel_mode = alc880_threestack_modes;
-                spec->num_channel_mode = ARRAY_SIZE(alc880_threestack_modes);
-                break;
-        }
-
-        spec->stream_name_analog = "ALC880 Analog";
-        spec->stream_analog_playback = &alc880_pcm_analog_playback;
-        spec->stream_analog_capture = &alc880_pcm_analog_capture;
-
-        spec->stream_name_digital = "ALC880 Digital";
-        spec->stream_digital_playback = &alc880_pcm_digital_playback;
-        spec->stream_digital_capture = &alc880_pcm_digital_capture;
-
-        spec->multiout.max_channels = spec->channel_mode[0].channels;
-
-        switch (board_config) {
-        case ALC880_W810:
-                spec->multiout.num_dacs = ARRAY_SIZE(alc880_w810_dac_nids);
-                spec->multiout.dac_nids = alc880_w810_dac_nids;
-                // No dedicated headphone socket - it's shared with built-in speakers.
-                break;
-        case ALC880_Z71V:
-            spec->multiout.num_dacs = ARRAY_SIZE(alc880_z71v_dac_nids);
-            spec->multiout.dac_nids = alc880_z71v_dac_nids;
-            spec->multiout.hp_nid = 0x03;
-            break;
-#ifdef CONFIG_SND_DEBUG
-        case ALC880_TEST:
-            spec->multiout.num_dacs = ARRAY_SIZE(alc880_test_dac_nids);
-            spec->multiout.dac_nids = alc880_test_dac_nids;
-            spec->input_mux = &alc880_test_capture_source;
-            break;
-#endif
-        default:
-                spec->multiout.num_dacs = ARRAY_SIZE(alc880_dac_nids);
-                spec->multiout.dac_nids = alc880_dac_nids;
-                spec->multiout.hp_nid = 0x03; /* rear-surround NID */
-                break;
-        }
-
-        if (! spec->input_mux)
-            spec->input_mux = &alc880_capture_source;
-        spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids);
-        spec->adc_nids = alc880_adc_nids;
-
-        codec->patch_ops = alc_patch_ops;
-
-        return 0;
-}
-
-/*
- * ALC260 support
- */
-
-/*
- * This is just place-holder, so there's something for alc_build_pcms to look
- * at when it calculates the maximum number of channels. ALC260 has no mixer
- * element which allows changing the channel mode, so the verb list is
- * never used.
- */
-static struct alc_channel_mode alc260_modes[1] = {
-        { 2, 0 },
-};
-
-snd_kcontrol_new_t alc260_base_mixer[] = {
-    ALC_BIND_VOL("Front Playback Volume", 0x08, 2, HDA_OUTPUT),
-    /* use LINE2 for the output */
-    /* HDA_CODEC_MUTE("Front Playback Switch", 0x0f, 0x0, HDA_OUTPUT), */
-    HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x07, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x07, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x07, 0x05, HDA_INPUT),
-        ALC_BIND_VOL("Headphone Playback Volume", 0x09, 2, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x10, 0x0, HDA_OUTPUT),
-        ALC_BIND_VOL_MONO("Mono Playback Volume", 0x0a, 1, 2, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x11, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x04, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x04, 0x0, HDA_INPUT),
+static struct snd_kcontrol_new alc260_capture_alt_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x05, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x05, 0x0, HDA_INPUT),
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-                /*.name = */"Capture Source",0,0,0,
-                /*.info = */alc_mux_enum_info,
-                /*.get = */alc_mux_enum_get,
-                /*.put = */alc_mux_enum_put,0
+                .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 = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
         },
         {0} /* end */
 };
 
+/*
+ * initialization verbs
+ */
 static struct hda_verb alc260_init_verbs[] = {
         /* Line In pin widget for input */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         /* CD pin widget for input */
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        /* Mic1 (rear panel) pin widget for input and vref at 80% */
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        /* Mic2 (front panel) pin widget for input and vref at 80% */
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        /* LINE-2 is used for line-out in rear */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* select line-out */
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* LINE-OUT pin */
+        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* enable HP */
+        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        /* enable Mono */
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* mute capture amp left and right */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        /* set connection select to line in (default select for this ADC) */
+        {0x04, AC_VERB_SET_CONNECT_SEL, 0x02},
+        /* mute capture amp left and right */
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        /* set connection select to line in (default select for this ADC) */
+        {0x05, AC_VERB_SET_CONNECT_SEL, 0x02},
+        /* set vol=0 Line-Out mixer amp left and right */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* unmute pin widget amp left and right (no gain on this amp) */
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* set vol=0 HP mixer amp left and right */
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* unmute pin widget amp left and right (no gain on this amp) */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* set vol=0 Mono mixer amp left and right */
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* unmute pin widget amp left and right (no gain on this amp) */
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* unmute LINE-2 out pin */
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
+        /* mute CD */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        /* mute Line In */
+        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        /* mute Mic */
+        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
+        /* mute Front out path */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* mute Headphone out path */
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* mute Mono out path */
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0}
+};
+
+static struct hda_verb alc260_hp_init_verbs[] = {
+        /* Headphone and output */
+        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
+        /* mono output */
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
         /* Mic1 (rear panel) pin widget for input and vref at 80% */
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
         /* Mic2 (front panel) pin widget for input and vref at 80% */
-        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* LINE-2 is used for line-out in rear */
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* select line-out */
-        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* LINE-OUT pin */
-        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* enable HP */
-        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* enable Mono */
-        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+        /* Line In pin widget for input */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+        /* Line-2 pin widget for output */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        /* CD pin widget for input */
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
         /* unmute amp left and right */
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
@@ -1678 +2546 @@
         /* unmute Line-Out mixer amp left and right (volume = 0) */
         {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* unmute Mono mixer amp left and right (volume = 0) */
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* mute pin widget amp left and right (no gain on this amp) */
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
         /* unmute HP mixer amp left and right (volume = 0) */
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-        /* mute LINE-2 out */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* mute pin widget amp left and right (no gain on this amp) */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
         /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
         /* unmute CD */
@@ -1703 +2565 @@
         /* Unmute Headphone out path */
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Mono out path */
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+        /* Unmute Mono out path */
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
         {0}
 };
 
+static struct hda_verb alc260_hp_3013_init_verbs[] = {
+        /* Line out and output */
+        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        /* mono output */
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        /* Mic1 (rear panel) pin widget for input and vref at 80% */
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+        /* Mic2 (front panel) pin widget for input and vref at 80% */
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+        /* Line In pin widget for input */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+        /* Headphone pin widget for output */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
+        /* CD pin widget for input */
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+        /* unmute amp left and right */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
+        /* set connection select to line in (default select for this ADC) */
+        {0x04, AC_VERB_SET_CONNECT_SEL, 0x02},
+        /* unmute Line-Out mixer amp left and right (volume = 0) */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        /* mute pin widget amp left and right (no gain on this amp) */
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+        /* unmute HP mixer amp left and right (volume = 0) */
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        /* mute pin widget amp left and right (no gain on this amp) */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+        /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
+        /* unmute CD */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
+        /* unmute Line In */
+        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
+        /* unmute Mic */
+        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
+        /* Unmute Front out path */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+        /* Unmute Headphone out path */
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+        /* Unmute Mono out path */
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+        {0}
+};
+
+/* Initialisation sequence for ALC260 as configured in Fujitsu S702x
+ * laptops.
+ */
+static struct hda_verb alc260_fujitsu_init_verbs[] = {
+        /* Disable all GPIOs */
+        {0x01, AC_VERB_SET_GPIO_MASK, 0},
+        /* Internal speaker is connected to headphone pin */
+        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        /* Headphone/Line-out jack connects to Line1 pin; make it an output */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* Mic/Line-in jack is connected to mic1 pin, so make it an input */
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        /* Ensure all other unused pins are disabled and muted.
+         * Note: trying to set widget 0x15 to anything blocks all audio
+         * output for some reason, so just leave that at the default.
+         */
+        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        /* Disable digital (SPDIF) pins */
+        {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
+        {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
+
+        /* Start with mixer outputs muted */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+
+        /* Unmute HP pin widget amp left and right (no equiv mixer ctrl) */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Unmute Line1 pin widget amp left and right (no equiv mixer ctrl) */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Unmute pin widget used for Line-in (no equiv mixer ctrl) */
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+        /* Mute capture amp left and right */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        /* Set ADC connection select to line in (on mic1 pin) */
+        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* Mute all inputs to mixer widget (even unconnected ones) */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
+
+        {0}
+};
+
 static struct hda_pcm_stream alc260_pcm_analog_playback = {
-        /*.substreams = */1,
-        /*.channels_min = */2,
-        /*.channels_max = */2,
-        /*.nid = */0x2,
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
 };
 
 static struct hda_pcm_stream alc260_pcm_analog_capture = {
-        /*.substreams = */1,
-        /*.channels_min = */2,
-        /*.channels_max = */2,
-        /*.nid = */0x4,
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+};
+
+#define alc260_pcm_digital_playback     alc880_pcm_digital_playback
+#define alc260_pcm_digital_capture      alc880_pcm_digital_capture
+
+/*
+ * for BIOS auto-configuration
+ */
+
+static int alc260_add_playback_controls(struct alc_spec *spec, hda_nid_t nid,
+                                        const char *pfx)
+{
+        hda_nid_t nid_vol;
+        unsigned long vol_val, sw_val;
+        char name[32];
+        int err;
+
+        if (nid >= 0x0f && nid < 0x11) {
+                nid_vol = nid - 0x7;
+                vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT);
+                sw_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
+        } else if (nid == 0x11) {
+                nid_vol = nid - 0x7;
+                vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0, HDA_OUTPUT);
+                sw_val = HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT);
+        } else if (nid >= 0x12 && nid <= 0x15) {
+                nid_vol = 0x08;
+                vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT);
+                sw_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
+        } else
+                return 0; /* N/A */
+        
+        sprintf(name, "%s Playback Volume", pfx);
+        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val)) < 0)
+                return err;
+        snprintf(name, sizeof(name), "%s Playback Switch", pfx);
+        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, sw_val)) < 0)
+                return err;
+        return 1;
+}
+
+/* add playback controls from the parsed DAC table */
+static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec,
+                                             const struct auto_pin_cfg *cfg)
+{
+        hda_nid_t nid;
+        int err;
+
+        spec->multiout.num_dacs = 1;
+        spec->multiout.dac_nids = spec->private_dac_nids;
+        spec->multiout.dac_nids[0] = 0x02;
+
+        nid = cfg->line_out_pins[0];
+        if (nid) {
+                err = alc260_add_playback_controls(spec, nid, "Front");
+                if (err < 0)
+                        return err;
+        }
+
+        nid = cfg->speaker_pin;
+        if (nid) {
+                err = alc260_add_playback_controls(spec, nid, "Speaker");
+                if (err < 0)
+                        return err;
+        }
+
+        nid = cfg->hp_pin;
+        if (nid) {
+                err = alc260_add_playback_controls(spec, nid, "Headphone");
+                if (err < 0)
+                        return err;
+        }
+        return 0;       
+}
+
+/* create playback/capture controls for input pins */
+static int alc260_auto_create_analog_input_ctls(struct alc_spec *spec,
+                                                const struct auto_pin_cfg *cfg)
+{
+        struct hda_input_mux *imux = &spec->private_imux;
+        int i, err, idx;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                if (cfg->input_pins[i] >= 0x12) {
+                        idx = cfg->input_pins[i] - 0x12;
+                        err = new_analog_input(spec, cfg->input_pins[i],
+                                               auto_pin_cfg_labels[i], idx, 0x07);
+                        if (err < 0)
+                                return err;
+                        imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
+                        imux->items[imux->num_items].index = idx;
+                        imux->num_items++;
+                }
+                if ((cfg->input_pins[i] >= 0x0f) && (cfg->input_pins[i] <= 0x10)){
+                        idx = cfg->input_pins[i] - 0x09;
+                        err = new_analog_input(spec, cfg->input_pins[i],
+                                               auto_pin_cfg_labels[i], idx, 0x07);
+                        if (err < 0)
+                                return err;
+                        imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
+                        imux->items[imux->num_items].index = idx;
+                        imux->num_items++;
+                }
+        }
+        return 0;
+}
+
+static void alc260_auto_set_output_and_unmute(struct hda_codec *codec,
+                                              hda_nid_t nid, int pin_type,
+                                              int sel_idx)
+{
+        /* set as output */
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+        /* need the manual connection? */
+        if (nid >= 0x12) {
+                int idx = nid - 0x12;
+                snd_hda_codec_write(codec, idx + 0x0b, 0,
+                                    AC_VERB_SET_CONNECT_SEL, sel_idx);
+                                    
+        }
+}
+
+static void alc260_auto_init_multi_out(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t nid;
+
+        nid = spec->autocfg.line_out_pins[0];   
+        if (nid)
+                alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
+        
+        nid = spec->autocfg.speaker_pin;
+        if (nid)
+                alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
+
+        nid = spec->autocfg.hp_pin;
+        if (nid)
+                alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
+}       
+
+#define ALC260_PIN_CD_NID               0x16
+static void alc260_auto_init_analog_input(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                hda_nid_t nid = spec->autocfg.input_pins[i];
+                if (nid >= 0x12) {
+                        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                            i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+                        if (nid != ALC260_PIN_CD_NID)
+                                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                                    AMP_OUT_MUTE);
+                }
+        }
+}
+
+/*
+ * generic initialization of ADC, input mixers and output mixers
+ */
+static struct hda_verb alc260_volume_init_verbs[] = {
+        /*
+         * Unmute ADC0-1 and set the default input to mic-in
+         */
+        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x05, 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
+         * Note: PASD motherboards uses the Line In 2 as the input for front panel
+         * mic (mic 2)
+         */
+        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+        /*
+         * Set up output mixers (0x08 - 0x0a)
+         */
+        /* set vol=0 to output mixers */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* set up input amps for analog loopback */
+        /* Amp Indices: DAC = 0, mixer = 1 */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        
+        {0}
+};
+
+static int alc260_parse_auto_config(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int wcap;
+        int err;
+        static hda_nid_t alc260_ignore[] = { 0x17, 0 };
+
+        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
+                                                alc260_ignore)) < 0)
+                return err;
+        if ((err = alc260_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0)
+                return err;
+        if (! spec->kctl_alloc)
+                return 0; /* can't find valid BIOS pin config */
+        if ((err = alc260_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+                return err;
+
+        spec->multiout.max_channels = 2;
+
+        if (spec->autocfg.dig_out_pin)
+                spec->multiout.dig_out_nid = ALC260_DIGOUT_NID;
+        if (spec->kctl_alloc)
+                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+        spec->init_verbs[spec->num_init_verbs++] = alc260_volume_init_verbs;
+
+        spec->input_mux = &spec->private_imux;
+
+        /* check whether NID 0x04 is valid */
+        wcap = get_wcaps(codec, 0x04);
+        wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
+        if (wcap != AC_WID_AUD_IN) {
+                spec->adc_nids = alc260_adc_nids_alt;
+                spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt);
+                spec->mixers[spec->num_mixers] = alc260_capture_alt_mixer;
+        } else {
+                spec->adc_nids = alc260_adc_nids;
+                spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids);
+                spec->mixers[spec->num_mixers] = alc260_capture_mixer;
+        }
+        spec->num_mixers++;
+
+        return 1;
+}
+
+/* init callback for auto-configuration model -- overriding the default init */
+static int alc260_auto_init(struct hda_codec *codec)
+{
+        alc_init(codec);
+        alc260_auto_init_multi_out(codec);
+        alc260_auto_init_analog_input(codec);
+        return 0;
+}
+
+/*
+ * ALC260 configurations
+ */
+static struct hda_board_config alc260_cfg_tbl[] = {
+        { .modelname = "basic", .config = ALC260_BASIC },
+        { .pci_subvendor = 0x104d, .pci_subdevice = 0x81bb,
+          .config = ALC260_BASIC }, /* Sony VAIO */
+        { .modelname = "hp", .config = ALC260_HP },
+        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3010, .config = ALC260_HP },
+        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3011, .config = ALC260_HP },
+        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3012, .config = ALC260_HP },
+        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3013, .config = ALC260_HP_3013 },
+        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3014, .config = ALC260_HP },
+        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3015, .config = ALC260_HP },
+        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3016, .config = ALC260_HP },
+        { .modelname = "fujitsu", .config = ALC260_FUJITSU_S702X },
+        { .pci_subvendor = 0x10cf, .pci_subdevice = 0x1326, .config = ALC260_FUJITSU_S702X },
+        { .modelname = "auto", .config = ALC260_AUTO },
+        {0}
+};
+
+static struct alc_config_preset alc260_presets[] = {
+        [ALC260_BASIC] = {
+                .mixers = { alc260_base_output_mixer,
+                            alc260_input_mixer,
+                            alc260_pc_beep_mixer,
+                            alc260_capture_mixer },
+                .init_verbs = { alc260_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+                .dac_nids = alc260_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc260_adc_nids),
+                .adc_nids = alc260_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc260_modes),
+                .channel_mode = alc260_modes,
+                .input_mux = &alc260_capture_source,
+        },
+        [ALC260_HP] = {
+                .mixers = { alc260_base_output_mixer,
+                            alc260_input_mixer,
+                            alc260_capture_alt_mixer },
+                .init_verbs = { alc260_hp_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+                .dac_nids = alc260_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),
+                .adc_nids = alc260_hp_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc260_modes),
+                .channel_mode = alc260_modes,
+                .input_mux = &alc260_capture_source,
+        },
+        [ALC260_HP_3013] = {
+                .mixers = { alc260_hp_3013_mixer,
+                            alc260_input_mixer,
+                            alc260_capture_alt_mixer },
+                .init_verbs = { alc260_hp_3013_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+                .dac_nids = alc260_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),
+                .adc_nids = alc260_hp_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc260_modes),
+                .channel_mode = alc260_modes,
+                .input_mux = &alc260_capture_source,
+        },
+        [ALC260_FUJITSU_S702X] = {
+                .mixers = { alc260_fujitsu_mixer,
+                            alc260_capture_mixer },
+                .init_verbs = { alc260_fujitsu_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+                .dac_nids = alc260_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc260_adc_nids),
+                .adc_nids = alc260_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc260_modes),
+                .channel_mode = alc260_modes,
+                .input_mux = &alc260_fujitsu_capture_source,
+        },
 };
 
@@ -1727 +3020 @@
 {
         struct alc_spec *spec;
-
-        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        int err, board_config;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
 
-        init_MUTEX(&spec->bind_mutex);
         codec->spec = spec;
 
-        spec->mixers[spec->num_mixers] = alc260_base_mixer;
-        spec->num_mixers++;
-
-        spec->init_verbs = alc260_init_verbs;
-        spec->channel_mode = alc260_modes;
-        spec->num_channel_mode = ARRAY_SIZE(alc260_modes);
+        board_config = snd_hda_check_board_config(codec, alc260_cfg_tbl);
+        if (board_config < 0 || board_config >= ALC260_MODEL_LAST) {
+                snd_printd(KERN_INFO "hda_codec: Unknown model for ALC260\n");
+                board_config = ALC260_AUTO;
+        }
+
+        if (board_config == ALC260_AUTO) {
+                /* automatic parse from the BIOS config */
+                err = alc260_parse_auto_config(codec);
+                if (err < 0) {
+                        alc_free(codec);
+                        return err;
+                } else if (! err) {
+                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
+                        board_config = ALC260_BASIC;
+                }
+        }
+
+        if (board_config != ALC260_AUTO)
+                setup_preset(spec, &alc260_presets[board_config]);
 
         spec->stream_name_analog = "ALC260 Analog";
@@ -1746 +3053 @@
         spec->stream_analog_capture = &alc260_pcm_analog_capture;
 
-        spec->multiout.max_channels = spec->channel_mode[0].channels;
-        spec->multiout.num_dacs = ARRAY_SIZE(alc260_dac_nids);
-        spec->multiout.dac_nids = alc260_dac_nids;
-
-        spec->input_mux = &alc260_capture_source;
-        spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids);
-        spec->adc_nids = alc260_adc_nids;
+        spec->stream_name_digital = "ALC260 Digital";
+        spec->stream_digital_playback = &alc260_pcm_digital_playback;
+        spec->stream_digital_capture = &alc260_pcm_digital_capture;
 
         codec->patch_ops = alc_patch_ops;
+        if (board_config == ALC260_AUTO)
+                codec->patch_ops.init = alc260_auto_init;
 
         return 0;
 }
+
 
 /*
@@ -1770 +3076 @@
  * driver yet).
  */
-
-static struct alc_channel_mode alc882_ch_modes[1] = {
-    { 8, NULL }
+#define ALC882_DIGOUT_NID       0x06
+#define ALC882_DIGIN_NID        0x0a
+
+static struct hda_channel_mode alc882_ch_modes[1] = {
+        { 8, NULL }
 };
 
 static hda_nid_t alc882_dac_nids[4] = {
-    /* front, rear, clfe, rear_surr */
-    0x02, 0x03, 0x04, 0x05
-};
-
-static hda_nid_t alc882_adc_nids[3] = {
-    /* ADC0-2 */
-    0x07, 0x08, 0x09,
-};
+        /* front, rear, clfe, rear_surr */
+        0x02, 0x03, 0x04, 0x05
+};
+
+/* identical with ALC880 */
+#define alc882_adc_nids         alc880_adc_nids
+#define alc882_adc_nids_alt     alc880_adc_nids_alt
 
 /* input MUX */
@@ -1789 +3096 @@
 
 static struct hda_input_mux alc882_capture_source = {
-    4,
-    {
-        { "Mic", 0x0 },
-        { "Front Mic", 0x1 },
-        { "Line", 0x2 },
-        { "CD", 0x4 },
-    },
+        .num_items = 4,
+        .items = {
+                { "Mic", 0x0 },
+                { "Front Mic", 0x1 },
+                { "Line", 0x2 },
+                { "CD", 0x4 },
+        },
 };
 
@@ -1801 +3108 @@
 #define alc882_mux_enum_get alc_mux_enum_get
 
-static int alc882_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-    struct alc_spec *spec = codec->spec;
-    const struct hda_input_mux *imux = spec->input_mux;
-    unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-    static hda_nid_t capture_mixers[3] = { 0x24, 0x23, 0x22 };
-    hda_nid_t nid = capture_mixers[adc_idx];
-    unsigned int *cur_val = &spec->cur_mux[adc_idx];
-    unsigned int i, idx;
-
-    idx = ucontrol->value.enumerated.item[0];
-    if (idx >= imux->num_items)
-        idx = imux->num_items - 1;
-    if (*cur_val == idx && ! codec->in_resume)
-        return 0;
-    for (i = 0; i < imux->num_items; i++) {
-        unsigned int v = (i == idx) ? 0x7000 : 0x7080;
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                            v | (imux->items[i].index << 8));
-    }
-    *cur_val = idx;
-    return 1;
-}
+static int alc882_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        const struct hda_input_mux *imux = spec->input_mux;
+        unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+        static hda_nid_t capture_mixers[3] = { 0x24, 0x23, 0x22 };
+        hda_nid_t nid = capture_mixers[adc_idx];
+        unsigned int *cur_val = &spec->cur_mux[adc_idx];
+        unsigned int i, idx;
+
+        idx = ucontrol->value.enumerated.item[0];
+        if (idx >= imux->num_items)
+                idx = imux->num_items - 1;
+        if (*cur_val == idx && ! codec->in_resume)
+                return 0;
+        for (i = 0; i < imux->num_items; i++) {
+                unsigned int v = (i == idx) ? 0x7000 : 0x7080;
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                    v | (imux->items[i].index << 8));
+        }
+        *cur_val = idx;
+        return 1;
+}
+
+/*
+ * 6ch mode
+ */
+static struct hda_verb alc882_sixstack_ch6_init[] = {
+        { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
+        { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        {0} /* end */
+};
+
+/*
+ * 8ch mode
+ */
+static struct hda_verb alc882_sixstack_ch8_init[] = {
+        { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        {0} /* end */
+};
+
+static struct hda_channel_mode alc882_sixstack_modes[2] = {
+        { 6, alc882_sixstack_ch6_init },
+        { 8, alc882_sixstack_ch8_init },
+};
 
 /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17
  *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b
  */
-static snd_kcontrol_new_t alc882_base_mixer[] = {
-    ALC_BIND_VOL("Front Playback Volume", 0x0c, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-    ALC_BIND_VOL("Surround Playback Volume", 0x0d, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Surround Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-    ALC_BIND_VOL_MONO("Center Playback Volume", 0x0e, 1, 2, HDA_OUTPUT),
-    ALC_BIND_VOL_MONO("LFE Playback Volume", 0x0e, 2, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x16, 1, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
-    ALC_BIND_VOL("Side Playback Volume", 0x0f, 2, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Side Playback Switch", 0x17, 0x0, HDA_OUTPUT),
-    HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
-    HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
-    HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-    HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
-    HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
-    HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-    HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-    HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-    HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
-    HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
-    HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
-    {
-        SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /* .name = "Capture Source", */
-        "Input Source",0,0,
-        3,
-        alc882_mux_enum_info,
-        alc882_mux_enum_get,
-        alc882_mux_enum_put,0
-    },
-    {0} /* end */
+static struct snd_kcontrol_new alc882_base_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
+        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                /* .name = "Capture Source", */
+                .name = "Input Source",
+                .count = 3,
+                .info = alc882_mux_enum_info,
+                .get = alc882_mux_enum_get,
+                .put = alc882_mux_enum_put,
+        },
+        {0} /* end */
+};
+
+static struct snd_kcontrol_new alc882_chmode_mixer[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Channel Mode",
+                .info = alc_ch_mode_info,
+                .get = alc_ch_mode_get,
+                .put = alc_ch_mode_put,
+        },
+        {0} /* end */
 };
 
 static struct hda_verb alc882_init_verbs[] = {
-    /* Front mixer: unmute input/output amp left and right (volume = 0) */
-    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-    /* Rear mixer */
-    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-    /* CLFE mixer */
-    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-    /* Side mixer */
-    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-
-    /* Front Pin: to output mode */
-    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-    /* Front Pin: mute amp left and right (no volume) */
-    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-    /* select Front mixer (0x0c, index 0) */
-    {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
-    /* Rear Pin */
-    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-    /* Rear Pin: mute amp left and right (no volume) */
-    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-    /* select Rear mixer (0x0d, index 1) */
-    {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
-    /* CLFE Pin */
-    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-    /* CLFE Pin: mute amp left and right (no volume) */
-    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-    /* select CLFE mixer (0x0e, index 2) */
-    {0x16, AC_VERB_SET_CONNECT_SEL, 0x02},
-    /* Side Pin */
-    {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-    /* Side Pin: mute amp left and right (no volume) */
-    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-    /* select Side mixer (0x0f, index 3) */
-    {0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
-    /* Headphone Pin */
-    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-    /* Headphone Pin: mute amp left and right (no volume) */
-    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-    /* select Front mixer (0x0c, index 0) */
-    {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
-    /* Mic (rear) pin widget for input and vref at 80% */
-    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-    /* Front Mic pin widget for input and vref at 80% */
-    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-    /* Line In pin widget for input */
-    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-    /* CD pin widget for input */
-    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-
-    /* FIXME: use matrix-type input source selection */
-    /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
-    /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
-    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-    /* Input mixer2 */
-    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-    /* Input mixer3 */
-    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-    /* ADC1: unmute amp left and right */
-    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-    /* ADC2: unmute amp left and right */
-    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-    /* ADC3: unmute amp left and right */
-    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-    /* Unmute front loopback */
-    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-    /* Unmute rear loopback */
-    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-    /* Mute CLFE loopback */
-    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))},
-    /* Unmute side loopback */
-    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-
-    {0}
-};
+        /* Front mixer: unmute input/output amp left and right (volume = 0) */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* Rear mixer */
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* CLFE mixer */
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* Side mixer */
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+
+        /* Front Pin: output 0 (0x0c) */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* Rear Pin: output 1 (0x0d) */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
+        /* CLFE Pin: output 2 (0x0e) */
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_CONNECT_SEL, 0x02},
+        /* Side Pin: output 3 (0x0f) */
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
+        /* Mic (rear) pin: input vref at 80% */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Front Mic pin: input vref at 80% */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Line In pin: input */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Line-2 In: Headphone output (output 0 - 0x0c) */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* CD pin widget for input */
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+        /* FIXME: use matrix-type input source selection */
+        /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+        /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        /* Input mixer2 */
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        /* Input mixer3 */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        /* ADC1: mute amp left and right */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* ADC2: mute amp left and right */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* ADC3: mute amp left and right */
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        {0}
+};
+
+/*
+ * generic initialization of ADC, input mixers and output mixers
+ */
+static struct hda_verb alc882_auto_init_verbs[] = {
+        /*
+         * Unmute ADC0-2 and set the default input to mic-in
+         */
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x09, 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
+         * Note: PASD motherboards uses the Line In 2 as the input for front panel
+         * mic (mic 2)
+         */
+        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+        /*
+         * Set up output mixers (0x0c - 0x0f)
+         */
+        /* set vol=0 to output mixers */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* set up input amps for analog loopback */
+        /* Amp Indices: DAC = 0, mixer = 1 */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        /* FIXME: use matrix-type input source selection */
+        /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+        /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+        /* Input mixer2 */
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+        /* Input mixer3 */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+
+        {0}
+};
+
+/* capture mixer elements */
+static struct snd_kcontrol_new alc882_capture_alt_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 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 = 2,
+                .info = alc882_mux_enum_info,
+                .get = alc882_mux_enum_get,
+                .put = alc882_mux_enum_put,
+        },
+        {0} /* end */
+};
+
+static struct snd_kcontrol_new alc882_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 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 = 3,
+                .info = alc882_mux_enum_info,
+                .get = alc882_mux_enum_get,
+                .put = alc882_mux_enum_put,
+        },
+        {0} /* end */
+};
+
+/* pcm configuration: identiacal with ALC880 */
+#define alc882_pcm_analog_playback      alc880_pcm_analog_playback
+#define alc882_pcm_analog_capture       alc880_pcm_analog_capture
+#define alc882_pcm_digital_playback     alc880_pcm_digital_playback
+#define alc882_pcm_digital_capture      alc880_pcm_digital_capture
+
+/*
+ * configuration and preset
+ */
+static struct hda_board_config alc882_cfg_tbl[] = {
+        { .modelname = "3stack-dig", .config = ALC861_3ST_DIG },
+        { .modelname = "6stack-dig", .config = ALC861_6ST_DIG },
+        { .pci_subvendor = 0x1462, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* MSI  */
+        { .pci_subvendor = 0x105b, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* Foxconn */
+        { .pci_subvendor = 0x1019, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* ECS */
+        { .modelname = "auto", .config = ALC861_AUTO },
+        {0}
+};
+
+static struct alc_config_preset alc882_presets[] = {
+        [ALC882_3ST_DIG] = {
+                .mixers = { alc882_base_mixer },
+                .init_verbs = { alc882_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc882_dac_nids),
+                .dac_nids = alc882_dac_nids,
+                .dig_out_nid = ALC882_DIGOUT_NID,
+                .num_adc_nids = ARRAY_SIZE(alc882_adc_nids),
+                .adc_nids = alc882_adc_nids,
+                .dig_in_nid = ALC882_DIGIN_NID,
+                .num_channel_mode = ARRAY_SIZE(alc882_ch_modes),
+                .channel_mode = alc882_ch_modes,
+                .input_mux = &alc882_capture_source,
+        },
+        [ALC882_6ST_DIG] = {
+                .mixers = { alc882_base_mixer, alc882_chmode_mixer },
+                .init_verbs = { alc882_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc882_dac_nids),
+                .dac_nids = alc882_dac_nids,
+                .dig_out_nid = ALC882_DIGOUT_NID,
+                .num_adc_nids = ARRAY_SIZE(alc882_adc_nids),
+                .adc_nids = alc882_adc_nids,
+                .dig_in_nid = ALC882_DIGIN_NID,
+                .num_channel_mode = ARRAY_SIZE(alc882_sixstack_modes),
+                .channel_mode = alc882_sixstack_modes,
+                .input_mux = &alc882_capture_source,
+        },
+};
+
+
+/*
+ * BIOS auto configuration
+ */
+static void alc882_auto_set_output_and_unmute(struct hda_codec *codec,
+                                              hda_nid_t nid, int pin_type,
+                                              int dac_idx)
+{
+        /* set as output */
+        struct alc_spec *spec = codec->spec;
+        int idx; 
+        
+        if (spec->multiout.dac_nids[dac_idx] == 0x25)
+                idx = 4;
+        else
+                idx = spec->multiout.dac_nids[dac_idx] - 2;
+
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, idx);
+
+}
+
+static void alc882_auto_init_multi_out(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i <= HDA_SIDE; i++) {
+                hda_nid_t nid = spec->autocfg.line_out_pins[i]; 
+                if (nid)
+                        alc882_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
+        }
+}
+
+static void alc882_auto_init_hp_out(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t pin;
+
+        pin = spec->autocfg.hp_pin;
+        if (pin) /* connect to front */
+                alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); /* use dac 0 */
+}
+
+#define alc882_is_input_pin(nid)        alc880_is_input_pin(nid)
+#define ALC882_PIN_CD_NID               ALC880_PIN_CD_NID
+
+static void alc882_auto_init_analog_input(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                hda_nid_t nid = spec->autocfg.input_pins[i];
+                if (alc882_is_input_pin(nid)) {
+                        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                            i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+                        if (nid != ALC882_PIN_CD_NID)
+                                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                                    AMP_OUT_MUTE);
+                }
+        }
+}
+
+/* almost identical with ALC880 parser... */
+static int alc882_parse_auto_config(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int err = alc880_parse_auto_config(codec);
+
+        if (err < 0)
+                return err;
+        else if (err > 0)
+                /* hack - override the init verbs */
+                spec->init_verbs[0] = alc882_auto_init_verbs;
+        return err;
+}
+
+/* init callback for auto-configuration model -- overriding the default init */
+static int alc882_auto_init(struct hda_codec *codec)
+{
+        alc_init(codec);
+        alc882_auto_init_multi_out(codec);
+        alc882_auto_init_hp_out(codec);
+        alc882_auto_init_analog_input(codec);
+        return 0;
+}
+
+/*
+ *  ALC882 Headphone poll in 3.5.1a or 3.5.2
+ */
 
 static int patch_alc882(struct hda_codec *codec)
 {
-    struct alc_spec *spec;
-
-    spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
-    if (spec == NULL)
-        return -ENOMEM;
-
-    init_MUTEX(&spec->bind_mutex);
-    codec->spec = spec;
-
-    spec->mixers[spec->num_mixers] = alc882_base_mixer;
-    spec->num_mixers++;
-
-    spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
-    spec->dig_in_nid = ALC880_DIGIN_NID;
-    spec->front_panel = 1;
-    spec->init_verbs = alc882_init_verbs;
-    spec->channel_mode = alc882_ch_modes;
-    spec->num_channel_mode = ARRAY_SIZE(alc882_ch_modes);
-
-    spec->stream_name_analog = "ALC882 Analog";
-    spec->stream_analog_playback = &alc880_pcm_analog_playback;
-    spec->stream_analog_capture = &alc880_pcm_analog_capture;
-
-    spec->stream_name_digital = "ALC882 Digital";
-    spec->stream_digital_playback = &alc880_pcm_digital_playback;
-    spec->stream_digital_capture = &alc880_pcm_digital_capture;
-
-    spec->multiout.max_channels = spec->channel_mode[0].channels;
-    spec->multiout.num_dacs = ARRAY_SIZE(alc882_dac_nids);
-    spec->multiout.dac_nids = alc882_dac_nids;
-
-    spec->input_mux = &alc882_capture_source;
-    spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids);
-    spec->adc_nids = alc882_adc_nids;
-
-    codec->patch_ops = alc_patch_ops;
-
-    return 0;
+        struct alc_spec *spec;
+        int err, board_config;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;
+
+        board_config = snd_hda_check_board_config(codec, alc882_cfg_tbl);
+
+        if (board_config < 0 || board_config >= ALC882_MODEL_LAST) {
+                printk(KERN_INFO "hda_codec: Unknown model for ALC882, trying auto-probe from BIOS...\n");
+                board_config = ALC882_AUTO;
+        }
+
+        if (board_config == ALC882_AUTO) {
+                /* automatic parse from the BIOS config */
+                err = alc882_parse_auto_config(codec);
+                if (err < 0) {
+                        alc_free(codec);
+                        return err;
+                } else if (! err) {
+                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
+                        board_config = ALC882_3ST_DIG;
+                }
+        }
+
+        if (board_config != ALC882_AUTO)
+                setup_preset(spec, &alc882_presets[board_config]);
+
+        spec->stream_name_analog = "ALC882 Analog";
+        spec->stream_analog_playback = &alc882_pcm_analog_playback;
+        spec->stream_analog_capture = &alc882_pcm_analog_capture;
+
+        spec->stream_name_digital = "ALC882 Digital";
+        spec->stream_digital_playback = &alc882_pcm_digital_playback;
+        spec->stream_digital_capture = &alc882_pcm_digital_capture;
+
+        if (! spec->adc_nids && spec->input_mux) {
+                /* check whether NID 0x07 is valid */
+                unsigned int wcap = get_wcaps(codec, 0x07);
+                wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
+                if (wcap != AC_WID_AUD_IN) {
+                        spec->adc_nids = alc882_adc_nids_alt;
+                        spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids_alt);
+                        spec->mixers[spec->num_mixers] = alc882_capture_alt_mixer;
+                        spec->num_mixers++;
+                } else {
+                        spec->adc_nids = alc882_adc_nids;
+                        spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids);
+                        spec->mixers[spec->num_mixers] = alc882_capture_mixer;
+                        spec->num_mixers++;
+                }
+        }
+
+        codec->patch_ops = alc_patch_ops;
+        if (board_config == ALC882_AUTO)
+                codec->patch_ops.init = alc882_auto_init;
+
+        return 0;
+}
+
+/*
+ * ALC262 support
+ */
+
+#define ALC262_DIGOUT_NID       ALC880_DIGOUT_NID
+#define ALC262_DIGIN_NID        ALC880_DIGIN_NID
+
+#define alc262_dac_nids         alc260_dac_nids
+#define alc262_adc_nids         alc882_adc_nids
+#define alc262_adc_nids_alt     alc882_adc_nids_alt
+
+#define alc262_modes            alc260_modes
+#define alc262_capture_source   alc882_capture_source
+
+static struct snd_kcontrol_new alc262_base_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
+        /* HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x0b, 0x05, HDA_INPUT),
+           HDA_CODEC_MUTE("PC Beelp Playback Switch", 0x0b, 0x05, HDA_INPUT), */
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0D, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .count = 1,
+                .info = alc882_mux_enum_info,
+                .get = alc882_mux_enum_get,
+                .put = alc882_mux_enum_put,
+        },
+        {0} /* end */
+};                      
+        
+#define alc262_capture_mixer            alc882_capture_mixer
+#define alc262_capture_alt_mixer        alc882_capture_alt_mixer
+
+/*
+ * generic initialization of ADC, input mixers and output mixers
+ */
+static struct hda_verb alc262_init_verbs[] = {
+        /*
+         * Unmute ADC0-2 and set the default input to mic-in
+         */
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x09, 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
+         * Note: PASD motherboards uses the Line In 2 as the input for front panel
+         * mic (mic 2)
+         */
+        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+        /*
+         * Set up output mixers (0x0c - 0x0e)
+         */
+        /* set vol=0 to output mixers */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* set up input amps for analog loopback */
+        /* Amp Indices: DAC = 0, mixer = 1 */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+        
+        {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
+        
+        /* FIXME: use matrix-type input source selection */
+        /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+        /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+        /* Input mixer2 */
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+        /* Input mixer3 */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},      
+
+        {0}
+};
+
+/* add playback controls from the parsed DAC table */
+static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
+{
+        hda_nid_t nid;
+        int err;
+
+        spec->multiout.num_dacs = 1;    /* only use one dac */
+        spec->multiout.dac_nids = spec->private_dac_nids;
+        spec->multiout.dac_nids[0] = 2;
+
+        nid = cfg->line_out_pins[0];
+        if (nid) {
+                if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Front Playback Volume",
+                                       HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT))) < 0)
+                        return err;
+                if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Front Playback Switch",
+                                       HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                        return err;
+        }
+
+        nid = cfg->speaker_pin;
+        if (nid) {
+                if (nid == 0x16) {
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Speaker Playback Volume",
+                                               HDA_COMPOSE_AMP_VAL(0x0e, 2, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Speaker Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                } else {
+                        if (! cfg->line_out_pins[0])
+                                if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Speaker Playback Volume",
+                                               HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT))) < 0)
+                                        return err;
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Speaker Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                }
+        }
+        nid = cfg->hp_pin;
+        if (nid) {
+                /* spec->multiout.hp_nid = 2; */
+                if (nid == 0x16) {
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Headphone Playback Volume",
+                                               HDA_COMPOSE_AMP_VAL(0x0e, 2, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                } else {
+                        if (! cfg->line_out_pins[0])
+                                if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Headphone Playback Volume",
+                                               HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT))) < 0)
+                                        return err;
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                }
+        }
+        return 0;       
+}
+
+/* identical with ALC880 */
+#define alc262_auto_create_analog_input_ctls alc880_auto_create_analog_input_ctls
+
+/*
+ * generic initialization of ADC, input mixers and output mixers
+ */
+static struct hda_verb alc262_volume_init_verbs[] = {
+        /*
+         * Unmute ADC0-2 and set the default input to mic-in
+         */
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x09, 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
+         * Note: PASD motherboards uses the Line In 2 as the input for front panel
+         * mic (mic 2)
+         */
+        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+        /*
+         * Set up output mixers (0x0c - 0x0f)
+         */
+        /* set vol=0 to output mixers */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        
+        /* set up input amps for analog loopback */
+        /* Amp Indices: DAC = 0, mixer = 1 */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        /* FIXME: use matrix-type input source selection */
+        /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+        /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+        /* Input mixer2 */
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+        /* Input mixer3 */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+
+        {0}
+};
+
+/* pcm configuration: identiacal with ALC880 */
+#define alc262_pcm_analog_playback      alc880_pcm_analog_playback
+#define alc262_pcm_analog_capture       alc880_pcm_analog_capture
+#define alc262_pcm_digital_playback     alc880_pcm_digital_playback
+#define alc262_pcm_digital_capture      alc880_pcm_digital_capture
+
+/*
+ * BIOS auto configuration
+ */
+static int alc262_parse_auto_config(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int err;
+        static hda_nid_t alc262_ignore[] = { 0x1d, 0 };
+
+        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
+                                                alc262_ignore)) < 0)
+                return err;
+        if (! spec->autocfg.line_outs && ! spec->autocfg.speaker_pin &&
+            ! spec->autocfg.hp_pin)
+                return 0; /* can't find valid BIOS pin config */
+        if ((err = alc262_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+            (err = alc262_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+                return err;
+
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+        if (spec->autocfg.dig_out_pin)
+                spec->multiout.dig_out_nid = ALC262_DIGOUT_NID;
+        if (spec->autocfg.dig_in_pin)
+                spec->dig_in_nid = ALC262_DIGIN_NID;
+
+        if (spec->kctl_alloc)
+                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+        spec->init_verbs[spec->num_init_verbs++] = alc262_volume_init_verbs;
+        spec->input_mux = &spec->private_imux;
+
+        return 1;
+}
+
+#define alc262_auto_init_multi_out      alc882_auto_init_multi_out
+#define alc262_auto_init_hp_out         alc882_auto_init_hp_out
+#define alc262_auto_init_analog_input   alc882_auto_init_analog_input
+
+
+/* init callback for auto-configuration model -- overriding the default init */
+static int alc262_auto_init(struct hda_codec *codec)
+{
+        alc_init(codec);
+        alc262_auto_init_multi_out(codec);
+        alc262_auto_init_hp_out(codec);
+        alc262_auto_init_analog_input(codec);
+        return 0;
+}
+
+/*
+ * configuration and preset
+ */
+static struct hda_board_config alc262_cfg_tbl[] = {
+        { .modelname = "basic", .config = ALC262_BASIC },
+        { .modelname = "auto", .config = ALC262_AUTO },
+        {0}
+};
+
+static struct alc_config_preset alc262_presets[] = {
+        [ALC262_BASIC] = {
+                .mixers = { alc262_base_mixer },
+                .init_verbs = { alc262_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc262_dac_nids),
+                .dac_nids = alc262_dac_nids,
+                .hp_nid = 0x03,
+                .num_channel_mode = ARRAY_SIZE(alc262_modes),
+                .channel_mode = alc262_modes,
+                .input_mux = &alc262_capture_source,
+        },
+};
+
+static int patch_alc262(struct hda_codec *codec)
+{
+        struct alc_spec *spec;
+        int board_config;
+        int err;
+
+        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;
+#if 0
+        /* pshou 07/11/05  set a zero PCM sample to DAC when FIFO is under-run */
+        {
+        int tmp;
+        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_COEF_INDEX, 7);
+        tmp = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_PROC_COEF, 0);
+        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_COEF_INDEX, 7);
+        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PROC_COEF, tmp | 0x80);
+        }
+#endif
+
+        board_config = snd_hda_check_board_config(codec, alc262_cfg_tbl);
+        if (board_config < 0 || board_config >= ALC262_MODEL_LAST) {
+                printk(KERN_INFO "hda_codec: Unknown model for ALC262, trying auto-probe from BIOS...\n");
+                board_config = ALC262_AUTO;
+        }
+
+        if (board_config == ALC262_AUTO) {
+                /* automatic parse from the BIOS config */
+                err = alc262_parse_auto_config(codec);
+                if (err < 0) {
+                        alc_free(codec);
+                        return err;
+                } else if (! err) {
+                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
+                        board_config = ALC262_BASIC;
+                }
+        }
+
+        if (board_config != ALC262_AUTO)
+                setup_preset(spec, &alc262_presets[board_config]);
+
+        spec->stream_name_analog = "ALC262 Analog";
+        spec->stream_analog_playback = &alc262_pcm_analog_playback;
+        spec->stream_analog_capture = &alc262_pcm_analog_capture;
+                
+        spec->stream_name_digital = "ALC262 Digital";
+        spec->stream_digital_playback = &alc262_pcm_digital_playback;
+        spec->stream_digital_capture = &alc262_pcm_digital_capture;
+
+        if (! spec->adc_nids && spec->input_mux) {
+                /* check whether NID 0x07 is valid */
+                unsigned int wcap = get_wcaps(codec, 0x07);
+
+                wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
+                if (wcap != AC_WID_AUD_IN) {
+                        spec->adc_nids = alc262_adc_nids_alt;
+                        spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids_alt);
+                        spec->mixers[spec->num_mixers] = alc262_capture_alt_mixer;
+                        spec->num_mixers++;
+                } else {
+                        spec->adc_nids = alc262_adc_nids;
+                        spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids);
+                        spec->mixers[spec->num_mixers] = alc262_capture_mixer;
+                        spec->num_mixers++;
+                }
+        }
+
+        codec->patch_ops = alc_patch_ops;
+        if (board_config == ALC262_AUTO)
+                codec->patch_ops.init = alc262_auto_init;
+        
+        return 0;
+}
+
+
+/*
+ *  ALC861 channel source setting (2/6 channel selection for 3-stack)
+ */
+
+/*
+ * set the path ways for 2 channel output
+ * need to set the codec line out and mic 1 pin widgets to inputs
+ */
+static struct hda_verb alc861_threestack_ch2_init[] = {
+        /* set pin widget 1Ah (line in) for input */
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        /* set pin widget 18h (mic1/2) for input, for mic also enable the vref */
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+
+        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c },
+        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8)) }, //mic
+        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8)) }, //line in
+        {0} /* end */
+};
+/*
+ * 6ch mode
+ * need to set the codec line out and mic 1 pin widgets to outputs
+ */
+static struct hda_verb alc861_threestack_ch6_init[] = {
+        /* set pin widget 1Ah (line in) for output (Back Surround)*/
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* set pin widget 18h (mic1) for output (CLFE)*/
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+
+        { 0x0c, AC_VERB_SET_CONNECT_SEL, 0x00 },
+        { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00 },
+
+        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
+        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8)) }, //mic
+        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8)) }, //line in
+        {0} /* end */
+};
+
+static struct hda_channel_mode alc861_threestack_modes[2] = {
+        { 2, alc861_threestack_ch2_init },
+        { 6, alc861_threestack_ch6_init },
+};
+
+/* patch-ALC861 */
+
+static struct snd_kcontrol_new alc861_base_mixer[] = {
+        /* output mixer control */
+        HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT),
+
+        /*Input mixer control */
+        /* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),
+           HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),
+ 
+        /* Capture mixer control */
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .count = 1,
+                .info = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
+        },
+        {0} /* end */
+};
+
+static struct snd_kcontrol_new alc861_3ST_mixer[] = {
+        /* output mixer control */
+        HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),
+        /*HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT), */
+
+        /* Input mixer control */
+        /* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),
+           HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),
+ 
+        /* Capture mixer control */
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .count = 1,
+                .info = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Channel Mode",
+                .info = alc_ch_mode_info,
+                .get = alc_ch_mode_get,
+                .put = alc_ch_mode_put,
+                .private_value = ARRAY_SIZE(alc861_threestack_modes),
+        },
+        {0} /* end */
+};                      
+        
+/*
+ * generic initialization of ADC, input mixers and output mixers
+ */
+static struct hda_verb alc861_base_init_verbs[] = {
+        /*
+         * Unmute ADC0 and set the default input to mic-in
+         */
+        /* port-A for surround (rear panel) */
+        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        { 0x0e, AC_VERB_SET_CONNECT_SEL, 0x00 },
+        /* port-B for mic-in (rear panel) with vref */
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        /* port-C for line-in (rear panel) */
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        /* port-D for Front */
+        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        { 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },
+        /* port-E for HP out (front panel) */
+        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        /* route front PCM to HP */
+        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x01 },
+        /* port-F for mic-in (front panel) with vref */
+        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        /* port-G for CLFE (rear panel) */
+        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        { 0x1f, AC_VERB_SET_CONNECT_SEL, 0x00 },
+        /* port-H for side (rear panel) */
+        { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        { 0x20, AC_VERB_SET_CONNECT_SEL, 0x00 },
+        /* CD-in */
+        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        /* route front mic to ADC1*/
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        
+        /* Unmute DAC0~3 & spdif out*/
+        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        
+        /* Unmute Mixer 14 (mic) 1c (Line in)*/
+        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        
+        /* Unmute Stereo Mixer 15 */
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c          }, //Output 0~12 step
+
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)}, // hp used DAC 3 (Front)
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+
+        {0}
+};
+
+static struct hda_verb alc861_threestack_init_verbs[] = {
+        /*
+         * Unmute ADC0 and set the default input to mic-in
+         */
+        /* port-A for surround (rear panel) */
+        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
+        /* port-B for mic-in (rear panel) with vref */
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        /* port-C for line-in (rear panel) */
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        /* port-D for Front */
+        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        { 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },
+        /* port-E for HP out (front panel) */
+        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        /* route front PCM to HP */
+        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x01 },
+        /* port-F for mic-in (front panel) with vref */
+        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        /* port-G for CLFE (rear panel) */
+        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
+        /* port-H for side (rear panel) */
+        { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
+        /* CD-in */
+        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        /* route front mic to ADC1*/
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        /* Unmute DAC0~3 & spdif out*/
+        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        
+        /* Unmute Mixer 14 (mic) 1c (Line in)*/
+        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        
+        /* Unmute Stereo Mixer 15 */
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c          }, //Output 0~12 step
+
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)}, // hp used DAC 3 (Front)
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0}
+};
+/*
+ * generic initialization of ADC, input mixers and output mixers
+ */
+static struct hda_verb alc861_auto_init_verbs[] = {
+        /*
+         * Unmute ADC0 and set the default input to mic-in
+         */
+//      {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        
+        /* Unmute DAC0~3 & spdif out*/
+        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        
+        /* Unmute Mixer 14 (mic) 1c (Line in)*/
+        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        
+        /* Unmute Stereo Mixer 15 */
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c},
+
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},    
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},            
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},    
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},    
+
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},  // set Mic 1
+
+        {0}
+};
+
+/* pcm configuration: identiacal with ALC880 */
+#define alc861_pcm_analog_playback      alc880_pcm_analog_playback
+#define alc861_pcm_analog_capture       alc880_pcm_analog_capture
+#define alc861_pcm_digital_playback     alc880_pcm_digital_playback
+#define alc861_pcm_digital_capture      alc880_pcm_digital_capture
+
+
+#define ALC861_DIGOUT_NID       0x07
+
+static struct hda_channel_mode alc861_8ch_modes[1] = {
+        { 8, NULL }
+};
+
+static hda_nid_t alc861_dac_nids[4] = {
+        /* front, surround, clfe, side */
+        0x03, 0x06, 0x05, 0x04
+};
+
+static hda_nid_t alc861_adc_nids[1] = {
+        /* ADC0-2 */
+        0x08,
+};
+
+static struct hda_input_mux alc861_capture_source = {
+        .num_items = 5,
+        .items = {
+                { "Mic", 0x0 },
+                { "Front Mic", 0x3 },
+                { "Line", 0x1 },
+                { "CD", 0x4 },
+                { "Mixer", 0x5 },
+        },
+};
+
+/* fill in the dac_nids table from the parsed pin configuration */
+static int alc861_auto_fill_dac_nids(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
+{
+        int i;
+        hda_nid_t nid;
+
+        spec->multiout.dac_nids = spec->private_dac_nids;
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = cfg->line_out_pins[i];
+                if (nid) {
+                        if (i >= ARRAY_SIZE(alc861_dac_nids))
+                                continue;
+                        spec->multiout.dac_nids[i] = alc861_dac_nids[i];
+                }
+        }
+        spec->multiout.num_dacs = cfg->line_outs;
+        return 0;
+}
+
+/* add playback controls from the parsed DAC table */
+static int alc861_auto_create_multi_out_ctls(struct alc_spec *spec,
+                                             const struct auto_pin_cfg *cfg)
+{
+        char name[32];
+        static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };
+        hda_nid_t nid;
+        int i, idx, err;
+
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = spec->multiout.dac_nids[i];
+                if (! nid)
+                        continue;
+                if (nid == 0x05) {
+                        /* Center/LFE */
+                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "Center Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "LFE Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                } else {
+                        for (idx = 0; idx < ARRAY_SIZE(alc861_dac_nids) - 1; idx++)
+                                if (nid == alc861_dac_nids[idx])
+                                        break;
+                        sprintf(name, "%s Playback Switch", chname[idx]);
+                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
+                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                }
+        }
+        return 0;
+}
+
+static int alc861_auto_create_hp_ctls(struct alc_spec *spec, hda_nid_t pin)
+{
+        int err;
+        hda_nid_t nid;
+
+        if (! pin)
+                return 0;
+
+        if ((pin >= 0x0b && pin <= 0x10) || pin == 0x1f || pin == 0x20) {
+                nid = 0x03;
+                if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
+                                       HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                        return err;
+                spec->multiout.hp_nid = nid;
+        }
+        return 0;
+}
+
+/* create playback/capture controls for input pins */
+static int alc861_auto_create_analog_input_ctls(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
+{
+        struct hda_input_mux *imux = &spec->private_imux;
+        int i, err, idx, idx1;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                switch(cfg->input_pins[i]) {
+                case 0x0c:
+                        idx1 = 1;
+                        idx = 2;        // Line In
+                        break;
+                case 0x0f:
+                        idx1 = 2;
+                        idx = 2;        // Line In
+                        break;
+                case 0x0d:
+                        idx1 = 0;
+                        idx = 1;        // Mic In 
+                        break;
+                case 0x10:      
+                        idx1 = 3;
+                        idx = 1;        // Mic In 
+                        break;
+                case 0x11:
+                        idx1 = 4;
+                        idx = 0;        // CD
+                        break;
+                default:
+                        continue;
+                }
+
+                err = new_analog_input(spec, cfg->input_pins[i],
+                                       auto_pin_cfg_labels[i], idx, 0x15);
+                if (err < 0)
+                        return err;
+
+                imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
+                imux->items[imux->num_items].index = idx1;
+                imux->num_items++;      
+        }
+        return 0;
+}
+
+static struct snd_kcontrol_new alc861_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 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 = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
+        },
+        {0} /* end */
+};
+
+static void alc861_auto_set_output_and_unmute(struct hda_codec *codec, hda_nid_t nid,
+                                              int pin_type, int dac_idx)
+{
+        /* set as output */
+
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+        snd_hda_codec_write(codec, dac_idx, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+
+}
+
+static void alc861_auto_init_multi_out(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < spec->autocfg.line_outs; i++) {
+                hda_nid_t nid = spec->autocfg.line_out_pins[i];
+                if (nid)
+                        alc861_auto_set_output_and_unmute(codec, nid, PIN_OUT, spec->multiout.dac_nids[i]);
+        }
+}
+
+static void alc861_auto_init_hp_out(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t pin;
+
+        pin = spec->autocfg.hp_pin;
+        if (pin) /* connect to front */
+                alc861_auto_set_output_and_unmute(codec, pin, PIN_HP, spec->multiout.dac_nids[0]);
+}
+
+static void alc861_auto_init_analog_input(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                hda_nid_t nid = spec->autocfg.input_pins[i];
+                if ((nid>=0x0c) && (nid <=0x11)) {
+                        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                            i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+                }
+        }
+}
+
+/* parse the BIOS configuration and set up the alc_spec */
+/* return 1 if successful, 0 if the proper config is not found, or a negative error code */
+static int alc861_parse_auto_config(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int err;
+        static hda_nid_t alc861_ignore[] = { 0x1d, 0 };
+
+        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
+                                                alc861_ignore)) < 0)
+                return err;
+        if (! spec->autocfg.line_outs && ! spec->autocfg.speaker_pin &&
+            ! spec->autocfg.hp_pin)
+                return 0; /* can't find valid BIOS pin config */
+
+        if ((err = alc861_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 ||
+            (err = alc861_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+            (err = alc861_auto_create_hp_ctls(spec, spec->autocfg.hp_pin)) < 0 ||
+            (err = alc861_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+                return err;
+
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+        if (spec->autocfg.dig_out_pin)
+                spec->multiout.dig_out_nid = ALC861_DIGOUT_NID;
+
+        if (spec->kctl_alloc)
+                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+        spec->init_verbs[spec->num_init_verbs++] = alc861_auto_init_verbs;
+
+        spec->input_mux = &spec->private_imux;
+
+        spec->adc_nids = alc861_adc_nids;
+        spec->num_adc_nids = ARRAY_SIZE(alc861_adc_nids);
+        spec->mixers[spec->num_mixers] = alc861_capture_mixer;
+        spec->num_mixers++;
+
+        return 1;
+}
+
+/* init callback for auto-configuration model -- overriding the default init */
+static int alc861_auto_init(struct hda_codec *codec)
+{
+        alc_init(codec);
+        alc861_auto_init_multi_out(codec);
+        alc861_auto_init_hp_out(codec);
+        alc861_auto_init_analog_input(codec);
+
+        return 0;
+}
+
+
+/*
+ * configuration and preset
+ */
+static struct hda_board_config alc861_cfg_tbl[] = {
+        { .modelname = "3stack", .config = ALC861_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd600, .config = ALC861_3ST },
+        { .modelname = "3stack-dig", .config = ALC861_3ST_DIG },
+        { .modelname = "6stack-dig", .config = ALC861_6ST_DIG },
+        { .modelname = "auto", .config = ALC861_AUTO },
+        {0}
+};
+
+static struct alc_config_preset alc861_presets[] = {
+        [ALC861_3ST] = {
+                .mixers = { alc861_3ST_mixer },
+                .init_verbs = { alc861_threestack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc861_dac_nids),
+                .dac_nids = alc861_dac_nids,
+                .num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),
+                .channel_mode = alc861_threestack_modes,
+                .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
+                .adc_nids = alc861_adc_nids,
+                .input_mux = &alc861_capture_source,
+        },
+        [ALC861_3ST_DIG] = {
+                .mixers = { alc861_base_mixer },
+                .init_verbs = { alc861_threestack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc861_dac_nids),
+                .dac_nids = alc861_dac_nids,
+                .dig_out_nid = ALC861_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),
+                .channel_mode = alc861_threestack_modes,
+                .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
+                .adc_nids = alc861_adc_nids,
+                .input_mux = &alc861_capture_source,
+        },
+        [ALC861_6ST_DIG] = {
+                .mixers = { alc861_base_mixer },
+                .init_verbs = { alc861_base_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc861_dac_nids),
+                .dac_nids = alc861_dac_nids,
+                .dig_out_nid = ALC861_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc861_8ch_modes),
+                .channel_mode = alc861_8ch_modes,
+                .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
+                .adc_nids = alc861_adc_nids,
+                .input_mux = &alc861_capture_source,
+        },
+};      
+
+
+static int patch_alc861(struct hda_codec *codec)
+{
+        struct alc_spec *spec;
+        int board_config;
+        int err;
+
+        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;     
+
+        board_config = snd_hda_check_board_config(codec, alc861_cfg_tbl);
+        if (board_config < 0 || board_config >= ALC861_MODEL_LAST) {
+                printk(KERN_INFO "hda_codec: Unknown model for ALC861, trying auto-probe from BIOS...\n");
+                board_config = ALC861_AUTO;
+        }
+
+        if (board_config == ALC861_AUTO) {
+                /* automatic parse from the BIOS config */
+                err = alc861_parse_auto_config(codec);
+                if (err < 0) {
+                        alc_free(codec);
+                        return err;
+                } else if (! err) {
+                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
+                   board_config = ALC861_3ST_DIG;
+                }
+        }
+
+        if (board_config != ALC861_AUTO)
+                setup_preset(spec, &alc861_presets[board_config]);
+
+        spec->stream_name_analog = "ALC861 Analog";
+        spec->stream_analog_playback = &alc861_pcm_analog_playback;
+        spec->stream_analog_capture = &alc861_pcm_analog_capture;
+
+        spec->stream_name_digital = "ALC861 Digital";
+        spec->stream_digital_playback = &alc861_pcm_digital_playback;
+        spec->stream_digital_capture = &alc861_pcm_digital_capture;
+
+        codec->patch_ops = alc_patch_ops;
+        if (board_config == ALC861_AUTO)
+                codec->patch_ops.init = alc861_auto_init;
+                
+        return 0;
 }
 
@@ -2006 +4694 @@
  */
 struct hda_codec_preset snd_hda_preset_realtek[] = {
-    { /*.id = */0x10ec0260, 0,0,0,0,/*.name = */"ALC260", /*.patch = */patch_alc260 },
-    { /*.id = */0x10ec0880, 0,0,0,0,/*.name = */"ALC880", /*.patch = */patch_alc880 },
-    { /*.id = */0x10ec0882, 0,0,0,0,/*.name = */"ALC882", /*.patch = */patch_alc882 },
-    {0} /* terminator */
-};
+        { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 },
+        { .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 },
+        { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 },
+        { .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 },
+        { .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc882 },
+        { .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },
+        { .id = 0x10ec0861, .name = "ALC861", .patch = patch_alc861 },
+        {0} /* terminator */
+};

GPL/trunk/alsa-kernel/pci/hda/patch_sigmatel.c

@@ -5 +5 @@
  *
  * Copyright (c) 2005 Embedded Alley Solutions, Inc.
- * <matt@embeddedalley.com>
+ * Matt Porter <mporter@embeddedalley.com>
  *
  * Based on patch_cmedia.c and patch_realtek.c
@@ -31 +31 @@
 #include <linux/pci.h>
 #include <sound/core.h>
+#include <sound/asoundef.h>
 #include "hda_codec.h"
 #include "hda_local.h"
 
-#undef STAC_TEST
+#define NUM_CONTROL_ALLOC       32
+#define STAC_HP_EVENT           0x37
+#define STAC_UNSOL_ENABLE       (AC_USRSP_EN | STAC_HP_EVENT)
+
+#define STAC_REF                0
+#define STAC_D945GTP3           1
+#define STAC_D945GTP5           2
 
 struct sigmatel_spec {
+        struct snd_kcontrol_new *mixers[4];
+        unsigned int num_mixers;
+
+        int board_config;
+        unsigned int surr_switch: 1;
+        unsigned int line_switch: 1;
+        unsigned int mic_switch: 1;
+
         /* playback */
         struct hda_multi_out multiout;
-        hda_nid_t playback_nid;
+        hda_nid_t dac_nids[4];
 
         /* capture */
         hda_nid_t *adc_nids;
+        unsigned int num_adcs;
         hda_nid_t *mux_nids;
-        unsigned int num_adcs;
-        hda_nid_t capture_nid;
-
-        /* power management*/
-        hda_nid_t *pstate_nids;
-        unsigned int num_pstates;
+        unsigned int num_muxes;
+        hda_nid_t dig_in_nid;
 
         /* pin widgets */
         hda_nid_t *pin_nids;
         unsigned int num_pins;
-#ifdef STAC_TEST
         unsigned int *pin_configs;
-#endif
 
         /* codec specific stuff */
         struct hda_verb *init;
-        snd_kcontrol_new_t *mixer;
+        struct snd_kcontrol_new *mixer;
 
         /* capture source */
-        const struct hda_input_mux *input_mux;
+        struct hda_input_mux *input_mux;
         unsigned int cur_mux[2];
 
-        /* channel mode */
-        unsigned int num_ch_modes;
-        unsigned int cur_ch_mode;
-        const struct sigmatel_channel_mode *channel_modes;
-
-        struct hda_pcm pcm_rec[1];      /* PCM information */
+        /* i/o switches */
+        unsigned int io_switch[2];
+
+        struct hda_pcm pcm_rec[2];      /* PCM information */
+
+        /* dynamic controls and input_mux */
+        struct auto_pin_cfg autocfg;
+        unsigned int num_kctl_alloc, num_kctl_used;
+        struct snd_kcontrol_new *kctl_alloc;
+        struct hda_input_mux private_imux;
 };
 
@@ -86 +100 @@
 };
 
-static hda_nid_t stac9200_pstate_nids[3] = {
-        0x01, 0x02, 0x03,
+static hda_nid_t stac922x_adc_nids[2] = {
+        0x06, 0x07,
+};
+
+static hda_nid_t stac922x_mux_nids[2] = {
+        0x12, 0x13,
 };
 
 static hda_nid_t stac9200_pin_nids[8] = {
         0x08, 0x09, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
-};
-
-static hda_nid_t stac922x_adc_nids[2] = {
-        0x06, 0x07,
-};
-
-static hda_nid_t stac922x_mux_nids[2] = {
-        0x12, 0x13,
-};
-
-static hda_nid_t stac922x_dac_nids[4] = {
-        0x02, 0x03, 0x04, 0x05,
-};
-
-static hda_nid_t stac922x_pstate_nids[7] = {
-        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
 };
 
@@ -115 +117 @@
 };
 
-static int stac92xx_mux_enum_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int stac92xx_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -122 +124 @@
 }
 
-static int stac92xx_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int stac92xx_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -132 +134 @@
 }
 
-static int stac92xx_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
@@ -142 +144 @@
 }
 
-static struct hda_verb stac9200_ch2_init[] = {
+static struct hda_verb stac9200_core_init[] = {
         /* set dac0mux for dac converter */
-        { 0x07, 0x701, 0x00},
+        { 0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0}
 };
 
-static struct hda_verb stac922x_ch2_init[] = {
+static struct hda_verb stac922x_core_init[] = {
         /* set master volume and direct control */      
-        { 0x16, 0x70f, 0xff},
+        { 0x16, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
         {0}
 };
 
-struct sigmatel_channel_mode {
-        unsigned int channels;
-        const struct hda_verb *sequence;
-};
-
-static snd_kcontrol_new_t stac9200_mixer[] = {
+static struct snd_kcontrol_new stac9200_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0xb, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0xb, 0, HDA_OUTPUT),
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER, 0,0,
-                /*.name = */"Input Source",0,0,
-                /*.count = */1,
-                /*.info = */stac92xx_mux_enum_info,
-                /*.get = */stac92xx_mux_enum_get,
-                /*.put = */stac92xx_mux_enum_put,0
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input Source",
+                .count = 1,
+                .info = stac92xx_mux_enum_info,
+                .get = stac92xx_mux_enum_get,
+                .put = stac92xx_mux_enum_put,
         },
         HDA_CODEC_VOLUME("Capture Volume", 0x0a, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0a, 0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Input Mux Volume", 0x0c, 0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Capture Mux Volume", 0x0c, 0, HDA_OUTPUT),
         {0} /* end */
 };
 
-static snd_kcontrol_new_t stac922x_mixer[] = {
-        HDA_CODEC_VOLUME("PCM Playback Volume", 0x2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("PCM Playback Switch", 0x2, 0x0, HDA_OUTPUT),
+/* This needs to be generated dynamically based on sequence */
+static struct snd_kcontrol_new stac922x_mixer[] = {
         {
-                /*.iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-                /*.name = */"Input Source",0,0,
-                /*.count = */1,
-                /*.info = */stac92xx_mux_enum_info,
-                /*.get = */stac92xx_mux_enum_get,
-                /*.put = */stac92xx_mux_enum_put,0
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input Source",
+                .count = 1,
+                .info = stac92xx_mux_enum_info,
+                .get = stac92xx_mux_enum_get,
+                .put = stac92xx_mux_enum_put,
         },
         HDA_CODEC_VOLUME("Capture Volume", 0x17, 0x0, HDA_INPUT),
@@ -193 +189 @@
 };
 
-static struct hda_input_mux stac9200_input_mux = {
-        /*.num_items = */5,
-        /*.items = */{
-                { "Port B", 0x0 },
-                { "Port C", 0x1 },
-                { "Port D", 0x2 },
-                { "Port A", 0x3 },
-                { "CD", 0x4 },
-        }
-};
-
-static struct hda_input_mux stac922x_input_mux = {
-        /*.num_items = */7,
-        /*.items = */{
-                { "Port E", 0x0 },
-                { "CD", 0x1 },
-                { "Port F", 0x2 },
-                { "Port B", 0x3 },
-                { "Port C", 0x4 },
-                { "Port D", 0x5 },
-                { "Port A", 0x6 },
-        }
-};
-
 static int stac92xx_build_controls(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
         int err;
+        int i;
 
         err = snd_hda_add_new_ctls(codec, spec->mixer);
@@ -226 +199 @@
                 return err;
 
-        return 0;
-}
-
-#ifdef STAC_TEST
-static unsigned int stac9200_pin_configs[8] = {
-        0x40000100, 0x40000100, 0x0221401f, 0x01114010,
+        for (i = 0; i < spec->num_mixers; i++) {
+                err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
+                if (err < 0)
+                        return err;
+        }
+
+        if (spec->multiout.dig_out_nid) {
+                err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
+                if (err < 0)
+                        return err;
+        }
+        if (spec->dig_in_nid) {
+                err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
+                if (err < 0)
+                        return err;
+        }
+        return 0;       
+}
+
+static unsigned int ref9200_pin_configs[8] = {
+        0x01c47010, 0x01447010, 0x0221401f, 0x01114010,
         0x02a19020, 0x01a19021, 0x90100140, 0x01813122,
 };
 
-static unsigned int stac922x_pin_configs[14] = {
-        0x40000100, 0x40000100, 0x40000100, 0x01114010,
-        0x01813122, 0x40000100, 0x40000100, 0x40000100,
+static unsigned int *stac9200_brd_tbl[] = {
+        ref9200_pin_configs,
+};
+
+static struct hda_board_config stac9200_cfg_tbl[] = {
+        { .modelname = "ref",
+          .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x2668,      /* DFI LanParty */
+          .config = STAC_REF },
+        {0} /* terminator */
+};
+
+static unsigned int ref922x_pin_configs[10] = {
+        0x01014010, 0x01016011, 0x01012012, 0x0221401f,
+        0x01813122, 0x01011014, 0x01441030, 0x01c41030,
         0x40000100, 0x40000100,
+};
+
+static unsigned int d945gtp3_pin_configs[10] = {
+        0x0221401f, 0x01a19022, 0x01813021, 0x01114010,
+        0x40000100, 0x40000100, 0x40000100, 0x40000100,
+        0x02a19120, 0x40000100,
+};
+
+static unsigned int d945gtp5_pin_configs[10] = {
+        0x0221401f, 0x01111012, 0x01813024, 0x01114010,
+        0x01a19021, 0x01116011, 0x01452130, 0x40000100,
+        0x02a19320, 0x40000100,
+};
+
+static unsigned int *stac922x_brd_tbl[] = {
+        ref922x_pin_configs,
+        d945gtp3_pin_configs,
+        d945gtp5_pin_configs,
+};
+
+static struct hda_board_config stac922x_cfg_tbl[] = {
+        { .modelname = "ref",
+          .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x2668,      /* DFI LanParty */
+          .config = STAC_REF },         /* SigmaTel reference board */
+        { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x0101,
+          .config = STAC_D945GTP3 },    /* Intel D945GTP - 3 Stack */
+        { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x0404,
+          .config = STAC_D945GTP5 },    /* Intel D945GTP - 5 Stack */
+        { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x0303,
+          .config = STAC_D945GTP5 },    /* Intel D945GNT - 5 Stack */
+        { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x0013,
+          .config = STAC_D945GTP5 },    /* Intel D955XBK - 5 Stack */
+        {0} /* terminator */
 };
 
@@ -263 +301 @@
                                              AC_VERB_GET_CONFIG_DEFAULT,
                                              0x00);     
-                printk("pin nid %2.2x pin config %8.8x\n", spec->pin_nids[i], pin_cfg);
-        }
-}
-#endif
-
-static int stac92xx_set_pinctl(struct hda_codec *codec, hda_nid_t nid, unsigned int value)
-{
-        unsigned int pin_ctl;
-
-        pin_ctl = snd_hda_codec_read(codec, nid, 0,
-                                     AC_VERB_GET_PIN_WIDGET_CONTROL,
-                                     0x00);
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                            pin_ctl | value);
-
-        return 0;
-}
-
-static int stac92xx_set_vref(struct hda_codec *codec, hda_nid_t nid)
-{
-        unsigned int vref_caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP) >> AC_PINCAP_VREF_SHIFT;
-        unsigned int vref_ctl = AC_PINCTL_VREF_HIZ;
-
-        if (vref_caps & AC_PINCAP_VREF_100)
-                vref_ctl = AC_PINCTL_VREF_100;
-        else if (vref_caps & AC_PINCAP_VREF_80)
-                vref_ctl = AC_PINCTL_VREF_80;
-        else if (vref_caps & AC_PINCAP_VREF_50)
-                vref_ctl = AC_PINCTL_VREF_50;
-        else if (vref_caps & AC_PINCAP_VREF_GRD)
-                vref_ctl = AC_PINCTL_VREF_GRD;
-
-        stac92xx_set_pinctl(codec, nid, vref_ctl);
-        
-        return 0;
-}
-
-static int stac92xx_config_pin(struct hda_codec *codec, hda_nid_t nid, unsigned int pin_cfg)
-{
-        switch((pin_cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT) {
-                case AC_JACK_HP_OUT:
-                        /* Enable HP amp */
-                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_HP_EN);
-                        /* Fall through */
-                case AC_JACK_LINE_OUT:
-                case AC_JACK_SPEAKER:
-                        /* Enable output */
-                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
-                        break;
-                case AC_JACK_MIC_IN:
-                        /* Set vref */
-                        stac92xx_set_vref(codec, nid);
-                case AC_JACK_CD:
-                case AC_JACK_LINE_IN:
-                case AC_JACK_AUX:
-                        /* Enable input */
-                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_IN_EN);
-                        break;
-        }
-
-        return 0;
-}
-
-static int stac92xx_config_pins(struct hda_codec *codec)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        int i;
-        unsigned int pin_cfg;
-
-        for (i=0; i < spec->num_pins; i++) {
-                /* Default to disabled */
-                snd_hda_codec_write(codec, spec->pin_nids[i], 0,
-                                    AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                    0x00);
-
-                pin_cfg = snd_hda_codec_read(codec, spec->pin_nids[i], 0,
-                                             AC_VERB_GET_CONFIG_DEFAULT,
-                                             0x00);
-                if (((pin_cfg & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT) == AC_JACK_PORT_NONE)
-                        continue;       /* Move on */
-
-                stac92xx_config_pin(codec, spec->pin_nids[i], pin_cfg);
-        }
-
-        return 0;
-}
-
-static int stac92xx_init(struct hda_codec *codec)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        int i;
-
-        for (i=0; i < spec->num_pstates; i++)
-                snd_hda_codec_write(codec, spec->pstate_nids[i], 0,
-                                    AC_VERB_SET_POWER_STATE, 0x00);
-
-        mdelay(100);
-
-        snd_hda_sequence_write(codec, spec->init);
-
-#ifdef STAC_TEST
-        stac92xx_set_config_regs(codec);
-#endif
-
-        stac92xx_config_pins(codec);
-
-        return 0;
+                snd_printdd(KERN_INFO "hda_codec: pin nid %2.2x pin config %8.8x\n", spec->pin_nids[i], pin_cfg);
+        }
 }
 
@@ -377 +310 @@
 static int stac92xx_playback_pcm_open(struct hda_pcm_stream *hinfo,
                                       struct hda_codec *codec,
-                                      snd_pcm_substream_t *substream)
+                                      struct snd_pcm_substream *substream)
 {
         struct sigmatel_spec *spec = codec->spec;
@@ -387 +320 @@
                                          unsigned int stream_tag,
                                          unsigned int format,
-                                         snd_pcm_substream_t *substream)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
-                                                format, substream);
+                                         struct snd_pcm_substream *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag, format, substream);
 }
 
 static int stac92xx_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
                                         struct hda_codec *codec,
-                                        snd_pcm_substream_t *substream)
+                                        struct snd_pcm_substream *substream)
 {
         struct sigmatel_spec *spec = codec->spec;
         return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
 }
+
+/*
+ * Digital playback callbacks
+ */
+static int stac92xx_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
+                                          struct hda_codec *codec,
+                                          struct snd_pcm_substream *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
+}
+
+static int stac92xx_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
+                                           struct hda_codec *codec,
+                                           struct snd_pcm_substream *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
+}
+
 
 /*
@@ -409 +361 @@
                                         unsigned int stream_tag,
                                         unsigned int format,
-                                        snd_pcm_substream_t *substream)
+                                        struct snd_pcm_substream *substream)
 {
         struct sigmatel_spec *spec = codec->spec;
@@ -420 +372 @@
 static int stac92xx_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
                                         struct hda_codec *codec,
-                                        snd_pcm_substream_t *substream)
+                                        struct snd_pcm_substream *substream)
 {
         struct sigmatel_spec *spec = codec->spec;
@@ -428 +380 @@
 }
 
+static struct hda_pcm_stream stac92xx_pcm_digital_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        /* NID is set in stac92xx_build_pcms */
+        .ops = {
+                .open = stac92xx_dig_playback_pcm_open,
+                .close = stac92xx_dig_playback_pcm_close
+        },
+};
+
+static struct hda_pcm_stream stac92xx_pcm_digital_capture = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        /* NID is set in stac92xx_build_pcms */
+};
+
 static struct hda_pcm_stream stac92xx_pcm_analog_playback = {
-        /*.substreams = */1,
-        /*.channels_min = */2,
-        /*.channels_max = */2,
-        /*.nid = */0x02, /* NID to query formats and rates */
-        0,0,0,
-        /*.ops = */{
-                /*.open = */stac92xx_playback_pcm_open, 0,
-                /*.prepare = */stac92xx_playback_pcm_prepare,
-                /*.cleanup = */stac92xx_playback_pcm_cleanup
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 8,
+        .nid = 0x02, /* NID to query formats and rates */
+        .ops = {
+                .open = stac92xx_playback_pcm_open,
+                .prepare = stac92xx_playback_pcm_prepare,
+                .cleanup = stac92xx_playback_pcm_cleanup
         },
 };
 
 static struct hda_pcm_stream stac92xx_pcm_analog_capture = {
-        /*.substreams = */2,
-        /*.channels_min = */2,
-        /*.channels_max = */2,
-        /*.nid = */0x06, /* NID to query formats and rates */
-        0,0,0,
-        /*.ops = */{
-            0,0,
-            /*.prepare = */stac92xx_capture_pcm_prepare,
-            /*.cleanup = */stac92xx_capture_pcm_cleanup
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0x06, /* NID to query formats and rates */
+        .ops = {
+                .prepare = stac92xx_capture_pcm_prepare,
+                .cleanup = stac92xx_capture_pcm_cleanup
         },
 };
@@ -462 +429 @@
         codec->pcm_info = info;
 
-        info->name = "STAC92xx";
+        info->name = "STAC92xx Analog";
         info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_analog_playback;
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->playback_nid;
         info->stream[SNDRV_PCM_STREAM_CAPTURE] = stac92xx_pcm_analog_capture;
-        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->capture_nid;
+
+        if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
+                codec->num_pcms++;
+                info++;
+                info->name = "STAC92xx Digital";
+                if (spec->multiout.dig_out_nid) {
+                        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_digital_playback;
+                        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
+                }
+                if (spec->dig_in_nid) {
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE] = stac92xx_pcm_digital_capture;
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid;
+                }
+        }
+
+        return 0;
+}
+
+static void stac92xx_auto_set_pinctl(struct hda_codec *codec, hda_nid_t nid, int pin_type)
+
+{
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+}
+
+static int stac92xx_io_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int stac92xx_io_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct sigmatel_spec *spec = codec->spec;
+        int io_idx = kcontrol-> private_value & 0xff;
+
+        ucontrol->value.integer.value[0] = spec->io_switch[io_idx];
+        return 0;
+}
+
+static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct sigmatel_spec *spec = codec->spec;
+        hda_nid_t nid = kcontrol->private_value >> 8;
+        int io_idx = kcontrol-> private_value & 0xff;
+        unsigned short val = ucontrol->value.integer.value[0];
+
+        spec->io_switch[io_idx] = val;
+
+        if (val)
+                stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
+        else
+                stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_IN_EN);
+
+        return 1;
+}
+
+#define STAC_CODEC_IO_SWITCH(xname, xpval) \
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+          .name = xname, \
+          .index = 0, \
+          .info = stac92xx_io_switch_info, \
+          .get = stac92xx_io_switch_get, \
+          .put = stac92xx_io_switch_put, \
+          .private_value = xpval, \
+        }
+
+
+enum {
+        STAC_CTL_WIDGET_VOL,
+        STAC_CTL_WIDGET_MUTE,
+        STAC_CTL_WIDGET_IO_SWITCH,
+};
+
+static struct snd_kcontrol_new stac92xx_control_templates[] = {
+        HDA_CODEC_VOLUME(NULL, 0, 0, 0),
+        HDA_CODEC_MUTE(NULL, 0, 0, 0),
+        STAC_CODEC_IO_SWITCH(NULL, 0),
+};
+
+/* add dynamic controls */
+static int stac92xx_add_control(struct sigmatel_spec *spec, int type, const char *name, unsigned long val)
+{
+        struct snd_kcontrol_new *knew;
+
+        if (spec->num_kctl_used >= spec->num_kctl_alloc) {
+                int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC;
+
+                knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */
+                if (! knew)
+                        return -ENOMEM;
+                if (spec->kctl_alloc) {
+                        memcpy(knew, spec->kctl_alloc, sizeof(*knew) * spec->num_kctl_alloc);
+                        kfree(spec->kctl_alloc);
+                }
+                spec->kctl_alloc = knew;
+                spec->num_kctl_alloc = num;
+        }
+
+        knew = &spec->kctl_alloc[spec->num_kctl_used];
+        *knew = stac92xx_control_templates[type];
+        knew->name = kstrdup(name, GFP_KERNEL);
+        if (! knew->name)
+                return -ENOMEM;
+        knew->private_value = val;
+        spec->num_kctl_used++;
+        return 0;
+}
+
+/* flag inputs as additional dynamic lineouts */
+static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cfg *cfg)
+{
+        struct sigmatel_spec *spec = codec->spec;
+
+        switch (cfg->line_outs) {
+        case 3:
+                /* add line-in as side */
+                if (cfg->input_pins[AUTO_PIN_LINE]) {
+                        cfg->line_out_pins[3] = cfg->input_pins[AUTO_PIN_LINE];
+                        spec->line_switch = 1;
+                        cfg->line_outs++;
+                }
+                break;
+        case 2:
+                /* add line-in as clfe and mic as side */
+                if (cfg->input_pins[AUTO_PIN_LINE]) {
+                        cfg->line_out_pins[2] = cfg->input_pins[AUTO_PIN_LINE];
+                        spec->line_switch = 1;
+                        cfg->line_outs++;
+                }
+                if (cfg->input_pins[AUTO_PIN_MIC]) {
+                        cfg->line_out_pins[3] = cfg->input_pins[AUTO_PIN_MIC];
+                        spec->mic_switch = 1;
+                        cfg->line_outs++;
+                }
+                break;
+        case 1:
+                /* add line-in as surr and mic as clfe */
+                if (cfg->input_pins[AUTO_PIN_LINE]) {
+                        cfg->line_out_pins[1] = cfg->input_pins[AUTO_PIN_LINE];
+                        spec->line_switch = 1;
+                        cfg->line_outs++;
+                }
+                if (cfg->input_pins[AUTO_PIN_MIC]) {
+                        cfg->line_out_pins[2] = cfg->input_pins[AUTO_PIN_MIC];
+                        spec->mic_switch = 1;
+                        cfg->line_outs++;
+                }
+                break;
+        }
+
+        return 0;
+}
+
+/* fill in the dac_nids table from the parsed pin configuration */
+static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec, const struct auto_pin_cfg *cfg)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        hda_nid_t nid;
+        int i;
+
+        /* check the pins hardwired to audio widget */
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = cfg->line_out_pins[i];
+                spec->multiout.dac_nids[i] = snd_hda_codec_read(codec, nid, 0,
+                                        AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
+        }
+
+        spec->multiout.num_dacs = cfg->line_outs;
+
+        return 0;
+}
+
+/* add playback controls from the parsed DAC table */
+static int stac92xx_auto_create_multi_out_ctls(struct sigmatel_spec *spec, const struct auto_pin_cfg *cfg)
+{
+        char name[32];
+        static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };
+        hda_nid_t nid;
+        int i, err;
+
+        for (i = 0; i < cfg->line_outs; i++) {
+                if (!spec->multiout.dac_nids[i])
+                        continue;
+
+                nid = spec->multiout.dac_nids[i];
+
+                if (i == 2) {
+                        /* Center/LFE */
+                        if ((err = stac92xx_add_control(spec, STAC_CTL_WIDGET_VOL, "Center Playback Volume",
+                                               HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        if ((err = stac92xx_add_control(spec, STAC_CTL_WIDGET_VOL, "LFE Playback Volume",
+                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        if ((err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE, "Center Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        if ((err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE, "LFE Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                } else {
+                        sprintf(name, "%s Playback Volume", chname[i]);
+                        if ((err = stac92xx_add_control(spec, STAC_CTL_WIDGET_VOL, name,
+                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        sprintf(name, "%s Playback Switch", chname[i]);
+                        if ((err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE, name,
+                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                }
+        }
+
+        if (spec->line_switch)
+                if ((err = stac92xx_add_control(spec, STAC_CTL_WIDGET_IO_SWITCH, "Line In as Output Switch", cfg->input_pins[AUTO_PIN_LINE] << 8)) < 0)
+                        return err;
+
+        if (spec->mic_switch)
+                if ((err = stac92xx_add_control(spec, STAC_CTL_WIDGET_IO_SWITCH, "Mic as Output Switch", (cfg->input_pins[AUTO_PIN_MIC] << 8) | 1)) < 0)
+                        return err;
+
+        return 0;
+}
+
+/* add playback controls for HP output */
+static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec, struct auto_pin_cfg *cfg)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        hda_nid_t pin = cfg->hp_pin;
+        hda_nid_t nid;
+        int i, err;
+        unsigned int wid_caps;
+
+        if (! 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);
+
+        nid = snd_hda_codec_read(codec, pin, 0, AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
+        for (i = 0; i < cfg->line_outs; i++) {
+                if (! spec->multiout.dac_nids[i])
+                        continue;
+                if (spec->multiout.dac_nids[i] == nid)
+                        return 0;
+        }
+
+        spec->multiout.hp_nid = nid;
+
+        /* control HP volume/switch on the output mixer amp */
+        if ((err = stac92xx_add_control(spec, STAC_CTL_WIDGET_VOL, "Headphone Playback Volume",
+                                        HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                return err;
+        if ((err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
+                                        HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                return err;
+
+        return 0;
+}
+
+/* create playback/capture controls for input pins */
+static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const struct auto_pin_cfg *cfg)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        struct hda_input_mux *imux = &spec->private_imux;
+        hda_nid_t con_lst[HDA_MAX_NUM_INPUTS];
+        int i, j, k;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                int index = -1;
+                if (cfg->input_pins[i]) {
+                        /* Enable active pin widget as an input */
+                        stac92xx_auto_set_pinctl(codec, cfg->input_pins[i], AC_PINCTL_IN_EN);
+
+                        imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
+
+                        for (j=0; j<spec->num_muxes; j++) {
+                                int num_cons = snd_hda_get_connections(codec, spec->mux_nids[j], con_lst, HDA_MAX_NUM_INPUTS);
+                                for (k=0; k<num_cons; k++)
+                                        if (con_lst[k] == cfg->input_pins[i]) {
+                                                index = k;
+                                                break;
+                                        }
+                                if (index >= 0)
+                                        break;
+                        }
+                        imux->items[imux->num_items].index = index;
+                        imux->num_items++;
+                }
+        }
+
+        return 0;
+}
+
+static void stac92xx_auto_init_multi_out(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < spec->autocfg.line_outs; i++) {
+                hda_nid_t nid = spec->autocfg.line_out_pins[i];
+                stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
+        }
+}
+
+static void stac92xx_auto_init_hp_out(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        hda_nid_t pin;
+
+        pin = spec->autocfg.hp_pin;
+        if (pin) /* connect to front */
+                stac92xx_auto_set_pinctl(codec, pin, AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN);
+}
+
+static int stac922x_parse_auto_config(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int err;
+
+        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL)) < 0)
+                return err;
+        if ((err = stac92xx_add_dyn_out_pins(codec, &spec->autocfg)) < 0)
+                return err;
+        if ((err = stac92xx_auto_fill_dac_nids(codec, &spec->autocfg)) < 0)
+                return err;
+        if (! spec->autocfg.line_outs && ! spec->autocfg.hp_pin)
+                return 0; /* can't find valid pin config */
+
+        if ((err = stac92xx_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+            (err = stac92xx_auto_create_hp_ctls(codec, &spec->autocfg)) < 0 ||
+            (err = stac92xx_auto_create_analog_input_ctls(codec, &spec->autocfg)) < 0)
+                return err;
+
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+        if (spec->multiout.max_channels > 2)
+                spec->surr_switch = 1;
+
+        if (spec->autocfg.dig_out_pin) {
+                spec->multiout.dig_out_nid = 0x08;
+                stac92xx_auto_set_pinctl(codec, spec->autocfg.dig_out_pin, AC_PINCTL_OUT_EN);
+        }
+        if (spec->autocfg.dig_in_pin) {
+                spec->dig_in_nid = 0x09;
+                stac92xx_auto_set_pinctl(codec, spec->autocfg.dig_in_pin, AC_PINCTL_IN_EN);
+        }
+
+        if (spec->kctl_alloc)
+                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+        spec->input_mux = &spec->private_imux;
+
+        return 1;
+}
+
+static int stac9200_parse_auto_config(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int err;
+
+        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL)) < 0)
+                return err;
+
+        if ((err = stac92xx_auto_create_analog_input_ctls(codec, &spec->autocfg)) < 0)
+                return err;
+
+        if (spec->autocfg.dig_out_pin) {
+                spec->multiout.dig_out_nid = 0x05;
+                stac92xx_auto_set_pinctl(codec, spec->autocfg.dig_out_pin, AC_PINCTL_OUT_EN);
+        }
+        if (spec->autocfg.dig_in_pin) {
+                spec->dig_in_nid = 0x04;
+                stac92xx_auto_set_pinctl(codec, spec->autocfg.dig_in_pin, AC_PINCTL_IN_EN);
+        }
+
+        if (spec->kctl_alloc)
+                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+        spec->input_mux = &spec->private_imux;
+
+        return 1;
+}
+
+static int stac92xx_init(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+
+        snd_hda_sequence_write(codec, spec->init);
+
+        stac92xx_auto_init_multi_out(codec);
+        stac92xx_auto_init_hp_out(codec);
 
         return 0;
@@ -473 +837 @@
 static void stac92xx_free(struct hda_codec *codec)
 {
-        kfree(codec->spec);
-}
+        struct sigmatel_spec *spec = codec->spec;
+        int i;
+
+        if (! spec)
+                return;
+
+        if (spec->kctl_alloc) {
+                for (i = 0; i < spec->num_kctl_used; i++)
+                        kfree(spec->kctl_alloc[i].name);
+                kfree(spec->kctl_alloc);
+        }
+
+        kfree(spec);
+}
+
+static void stac92xx_set_pinctl(struct hda_codec *codec, hda_nid_t nid,
+                                unsigned int flag)
+{
+        unsigned int pin_ctl = snd_hda_codec_read(codec, nid,
+                        0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0x00);
+        snd_hda_codec_write(codec, nid, 0,
+                        AC_VERB_SET_PIN_WIDGET_CONTROL,
+                        pin_ctl | flag);
+}
+
+static void stac92xx_reset_pinctl(struct hda_codec *codec, hda_nid_t nid,
+                                  unsigned int flag)
+{
+        unsigned int pin_ctl = snd_hda_codec_read(codec, nid,
+                        0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0x00);
+        snd_hda_codec_write(codec, nid, 0,
+                        AC_VERB_SET_PIN_WIDGET_CONTROL,
+                        pin_ctl & ~flag);
+}
+
+static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        int i, presence;
+
+        if ((res >> 26) != STAC_HP_EVENT)
+                return;
+
+        presence = snd_hda_codec_read(codec, cfg->hp_pin, 0,
+                        AC_VERB_GET_PIN_SENSE, 0x00) >> 31;
+
+        if (presence) {
+                /* disable lineouts, enable hp */
+                for (i = 0; i < cfg->line_outs; i++)
+                        stac92xx_reset_pinctl(codec, cfg->line_out_pins[i],
+                                                AC_PINCTL_OUT_EN);
+                stac92xx_set_pinctl(codec, cfg->hp_pin, AC_PINCTL_OUT_EN);
+        } else {
+                /* enable lineouts, disable hp */
+                for (i = 0; i < cfg->line_outs; i++)
+                        stac92xx_set_pinctl(codec, cfg->line_out_pins[i],
+                                                AC_PINCTL_OUT_EN);
+                stac92xx_reset_pinctl(codec, cfg->hp_pin, AC_PINCTL_OUT_EN);
+        }
+} 
+
+#ifdef CONFIG_PM
+static int stac92xx_resume(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int i;
+
+        stac92xx_init(codec);
+        for (i = 0; i < spec->num_mixers; i++)
+                snd_hda_resume_ctls(codec, spec->mixers[i]);
+        if (spec->multiout.dig_out_nid)
+                snd_hda_resume_spdif_out(codec);
+        if (spec->dig_in_nid)
+                snd_hda_resume_spdif_in(codec);
+
+        return 0;
+}
+#endif
 
 static struct hda_codec_ops stac92xx_patch_ops = {
-        /*.build_controls = */stac92xx_build_controls,
-        /*.build_pcms = */stac92xx_build_pcms,
-        /*.init = */stac92xx_init,
-        /*.free = */stac92xx_free,0,
-        0,0
+        .build_controls = stac92xx_build_controls,
+        .build_pcms = stac92xx_build_pcms,
+        .init = stac92xx_init,
+        .free = stac92xx_free,
+        .unsol_event = stac92xx_unsol_event,
+#ifdef CONFIG_PM
+        .resume = stac92xx_resume,
+#endif
 };
 
@@ -487 +931 @@
 {
         struct sigmatel_spec *spec;
-
-        spec  = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        int err;
+
+        spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
 
         codec->spec = spec;
+        spec->board_config = snd_hda_check_board_config(codec, stac9200_cfg_tbl);
+        if (spec->board_config < 0)
+                snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9200, using BIOS defaults\n");
+        else {
+                spec->num_pins = 8;
+                spec->pin_nids = stac9200_pin_nids;
+                spec->pin_configs = stac9200_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
+        }
 
         spec->multiout.max_channels = 2;
@@ -499 +953 @@
         spec->adc_nids = stac9200_adc_nids;
         spec->mux_nids = stac9200_mux_nids;
-        spec->input_mux = &stac9200_input_mux;
-        spec->pstate_nids = stac9200_pstate_nids;
-        spec->num_pstates = 3;
-        spec->pin_nids = stac9200_pin_nids;
-#ifdef STAC_TEST
-        spec->pin_configs = stac9200_pin_configs;
-#endif
-        spec->num_pins = 8;
-        spec->init = stac9200_ch2_init;
+        spec->num_muxes = 1;
+
+        spec->init = stac9200_core_init;
         spec->mixer = stac9200_mixer;
-        spec->playback_nid = 0x02;
-        spec->capture_nid = 0x03;
+
+        err = stac9200_parse_auto_config(codec);
+        if (err < 0) {
+                stac92xx_free(codec);
+                return err;
+        }
 
         codec->patch_ops = stac92xx_patch_ops;
@@ -520 +972 @@
 {
         struct sigmatel_spec *spec;
-
-        spec  = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        int err;
+
+        spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
 
         codec->spec = spec;
-
-        spec->multiout.max_channels = 2;
-        spec->multiout.num_dacs = 4;
-        spec->multiout.dac_nids = stac922x_dac_nids;
+        spec->board_config = snd_hda_check_board_config(codec, stac922x_cfg_tbl);
+        if (spec->board_config < 0)
+                snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, using BIOS defaults\n");
+        else {
+                spec->num_pins = 10;
+                spec->pin_nids = stac922x_pin_nids;
+                spec->pin_configs = stac922x_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
+        }
+
         spec->adc_nids = stac922x_adc_nids;
         spec->mux_nids = stac922x_mux_nids;
-        spec->input_mux = &stac922x_input_mux;
-        spec->pstate_nids = stac922x_pstate_nids;
-        spec->num_pstates = 7;
-        spec->pin_nids = stac922x_pin_nids;
-#ifdef STAC_TEST
-        spec->pin_configs = stac922x_pin_configs;
-#endif
-        spec->num_pins = 10;
-        spec->init = stac922x_ch2_init;
+        spec->num_muxes = 2;
+
+        spec->init = stac922x_core_init;
         spec->mixer = stac922x_mixer;
-        spec->playback_nid = 0x02;
-        spec->capture_nid = 0x06;
+
+        spec->multiout.dac_nids = spec->dac_nids;
+
+        err = stac922x_parse_auto_config(codec);
+        if (err < 0) {
+                stac92xx_free(codec);
+                return err;
+        }
 
         codec->patch_ops = stac92xx_patch_ops;
@@ -554 +1013 @@
  */
 struct hda_codec_preset snd_hda_preset_sigmatel[] = {
-        { /*.id = */0x83847690, 0, 0, 0, 0,/*.name = */"STAC9200",    /*.patch = */patch_stac9200 },
-        { /*.id = */0x83847882, 0, 0, 0, 0,/*.name = */"STAC9220 A1", /*.patch = */patch_stac922x },
-        { /*.id = */0x83847680, 0, 0, 0, 0,/*.name = */"STAC9221 A1", /*.patch = */patch_stac922x },
-        { /*.id = */0x83847880, 0, 0, 0, 0,/*.name = */"STAC9220 A2", /*.patch = */patch_stac922x },
-        { /*.id = */0x83847681, 0, 0, 0, 0,/*.name = */"STAC9220D/9223D A2", /*.patch = */patch_stac922x },
-        { /*.id = */0x83847682, 0, 0, 0, 0,/*.name = */"STAC9221 A2", /*.patch = */patch_stac922x },
-        { /*.id = */0x83847683, 0, 0, 0, 0,/*.name = */"STAC9221D A2", /*.patch = */patch_stac922x },
+        { .id = 0x83847690, .name = "STAC9200", .patch = patch_stac9200 },
+        { .id = 0x83847882, .name = "STAC9220 A1", .patch = patch_stac922x },
+        { .id = 0x83847680, .name = "STAC9221 A1", .patch = patch_stac922x },
+        { .id = 0x83847880, .name = "STAC9220 A2", .patch = patch_stac922x },
+        { .id = 0x83847681, .name = "STAC9220D/9223D A2", .patch = patch_stac922x },
+        { .id = 0x83847682, .name = "STAC9221 A2", .patch = patch_stac922x },
+        { .id = 0x83847683, .name = "STAC9221D A2", .patch = patch_stac922x },
         {0} /* terminator */
 };