Attachment 309053 Details for Bug 451007 – ALSA HDA driver update for RHEL 5.3

[patch] ALSA HDA driver update for RHEL 5.3

rhel-5.3-hda-update.patch (text/plain), 864.74 KB, created by Jaroslav Kysela on 2008-06-12 12:06:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jaroslav Kysela

Created: 2008-06-12 12:06:03 UTC

Size: 864.74 KB

patch

obsolete

>From 444dc3c198af986f281b38635b32f770def1c7cc Mon Sep 17 00:00:00 2001
>From: Jaroslav Kysela <perex@perex.cz>
>Date: Thu, 12 Jun 2008 11:17:30 +0200
>Subject: [PATCH] [RHEL 5.3 PATCH] ALSA - HDA driver update from mainstream 2008-06-11
>
>Bugzilla
>========
>BZ#451007
>https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=451007
>
>Bugs expected to be resolved:
>BZ#367071
>https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=367071
>BZ#437327
>https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=437327
>BZ#438465
>https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=438465
>BZ#445883
>https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=445883
>
>Description
>===========
>This patch contains backported mainstream ALSA code for HDA driver.
>It enables support for new hardware (integrated audio on motherboards
>and notebooks).
>
>Test Status
>===========
>Tested on Lenovo T61 (AD1984).
>---
> include/sound/asound.h          |    3 +-
> include/sound/control.h         |   15 +
> include/sound/hda_hwdep.h       |   44 +
> include/sound/pcm.h             |    3 +
> redhat/configs/config-generic   |    1 +
> redhat/kernel-2.6.spec.template |    2 +-
> sound/core/Kconfig              |    3 +
> sound/core/Makefile             |    1 +
> sound/core/control.c            |   27 +
> sound/core/vmaster.c            |  372 ++
> sound/pci/Kconfig               |   18 +
> sound/pci/hda/Makefile          |   32 +-
> sound/pci/hda/hda_codec.c       | 1604 ++++++---
> sound/pci/hda/hda_codec.h       |  186 +-
> sound/pci/hda/hda_generic.c     |  107 +-
> sound/pci/hda/hda_hwdep.c       |  122 +
> sound/pci/hda/hda_intel.c       | 1100 ++++--
> sound/pci/hda/hda_local.h       |  189 +-
> sound/pci/hda/hda_patch.h       |   12 -
> sound/pci/hda/hda_proc.c        |  390 ++-
> sound/pci/hda/patch_analog.c    | 1252 ++++++-
> sound/pci/hda/patch_atihdmi.c   |   42 +-
> sound/pci/hda/patch_cmedia.c    |   56 +-
> sound/pci/hda/patch_conexant.c  | 1011 ++++--
> sound/pci/hda/patch_realtek.c   | 7758 ++++++++++++++++++++++++++++++++++-----
> sound/pci/hda/patch_si3054.c    |   32 +-
> sound/pci/hda/patch_sigmatel.c  | 2605 +++++++++++--
> sound/pci/hda/patch_via.c       |  761 ++++-
> 28 files changed, 14746 insertions(+), 3002 deletions(-)
> create mode 100644 include/sound/hda_hwdep.h
> create mode 100644 sound/core/vmaster.c
> create mode 100644 sound/pci/hda/hda_hwdep.c
>
>diff --git a/include/sound/asound.h b/include/sound/asound.h
>index c1621c6..3ff06f6 100644
>--- a/include/sound/asound.h
>+++ b/include/sound/asound.h
>@@ -92,9 +92,10 @@ enum {
> 	SNDRV_HWDEP_IFACE_USX2Y_PCM,	/* Tascam US122, US224 & US428 rawusb pcm */
> 	SNDRV_HWDEP_IFACE_PCXHR,	/* Digigram PCXHR */
> 	SNDRV_HWDEP_IFACE_SB_RC,	/* SB Extigy/Audigy2NX remote control */
>+	SNDRV_HWDEP_IFACE_HDA,		/* HD-audio */
> 
> 	/* Don't forget to change the following: */
>-	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_SB_RC
>+	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_HDA
> };
> 
> struct snd_hwdep_info {
>diff --git a/include/sound/control.h b/include/sound/control.h
>index 72e759f..5c28245 100644
>--- a/include/sound/control.h
>+++ b/include/sound/control.h
>@@ -161,4 +161,19 @@ static inline struct snd_ctl_elem_id *snd_ctl_build_ioff(struct snd_ctl_elem_id
> 	return dst_id;
> }
> 
>+/*
>+ * Frequently used control callbacks
>+ */
>+int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,
>+			      struct snd_ctl_elem_info *uinfo);
>+int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
>+			      struct snd_ctl_elem_info *uinfo);
>+
>+/*
>+ * virtual master control
>+ */
>+struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
>+						 const unsigned int *tlv);
>+int snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave);
>+
> #endif	/* __SOUND_CONTROL_H */
>diff --git a/include/sound/hda_hwdep.h b/include/sound/hda_hwdep.h
>new file mode 100644
>index 0000000..1c0034e
>--- /dev/null
>+++ b/include/sound/hda_hwdep.h
>@@ -0,0 +1,44 @@
>+/*
>+ * HWDEP Interface for HD-audio codec
>+ *
>+ * Copyright (c) 2007 Takashi Iwai <tiwai@suse.de>
>+ *
>+ *  This driver is free software; you can redistribute it and/or modify
>+ *  it under the terms of the GNU General Public License as published by
>+ *  the Free Software Foundation; either version 2 of the License, or
>+ *  (at your option) any later version.
>+ *
>+ *  This driver is distributed in the hope that it will be useful,
>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>+ *  GNU General Public License for more details.
>+ *
>+ *  You should have received a copy of the GNU General Public License
>+ *  along with this program; if not, write to the Free Software
>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
>+ */
>+
>+#ifndef __SOUND_HDA_HWDEP_H
>+#define __SOUND_HDA_HWDEP_H
>+
>+#define HDA_HWDEP_VERSION	((1 << 16) | (0 << 8) | (0 << 0)) /* 1.0.0 */
>+
>+/* verb */
>+#define HDA_REG_NID_SHIFT	24
>+#define HDA_REG_VERB_SHIFT	8
>+#define HDA_REG_VAL_SHIFT	0
>+#define HDA_VERB(nid,verb,param)	((nid)<<24 | (verb)<<8 | (param))
>+
>+struct hda_verb_ioctl {
>+	u32 verb;	/* HDA_VERB() */
>+	u32 res;	/* response */
>+};
>+
>+/*
>+ * ioctls
>+ */
>+#define HDA_IOCTL_PVERSION		_IOR('H', 0x10, int)
>+#define HDA_IOCTL_VERB_WRITE		_IOWR('H', 0x11, struct hda_verb_ioctl)
>+#define HDA_IOCTL_GET_WCAP		_IOWR('H', 0x12, struct hda_verb_ioctl)
>+
>+#endif
>diff --git a/include/sound/pcm.h b/include/sound/pcm.h
>index deff5a9..91b13bd 100644
>--- a/include/sound/pcm.h
>+++ b/include/sound/pcm.h
>@@ -609,6 +609,9 @@ do { \
> #define snd_pcm_group_substream_entry(pos) \
> 	list_entry(pos, struct snd_pcm_substream, link_list)
> 
>+#define snd_pcm_group_for_each_entry(s, substream) \
>+	list_for_each_entry(s, &substream->group->substreams, link_list)
>+
> static inline int snd_pcm_running(struct snd_pcm_substream *substream)
> {
> 	return (substream->runtime->status->state == SNDRV_PCM_STATE_RUNNING ||
>diff --git a/redhat/configs/config-generic b/redhat/configs/config-generic
>index 0eaccd3..ee916ff 100644
>--- a/redhat/configs/config-generic
>+++ b/redhat/configs/config-generic
>@@ -2133,6 +2133,7 @@ CONFIG_SND_MIXART=m
> CONFIG_SND_FM801_TEA575X_BOOL=y
> CONFIG_SND_INTEL8X0M=m
> CONFIG_SND_HDA_INTEL=m
>+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
> CONFIG_SND_HDSPM=m
> CONFIG_SND_ADLIB=m
> CONFIG_SND_MIRO=m
>diff --git a/redhat/kernel-2.6.spec.template b/redhat/kernel-2.6.spec.template
>index 1ccbe2d..f10d05f 100644
>--- a/redhat/kernel-2.6.spec.template
>+++ b/redhat/kernel-2.6.spec.template
>@@ -66,7 +66,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
> # that the kernel isn't the stock distribution kernel, for example,
> # by setting the define to ".local" or ".bz123456"
> #
>-%define buildid dz_test
>+%define buildid .hdaUpdate2
> #
> %define sublevel 18
> %define kversion 2.6.%{sublevel}
>diff --git a/sound/core/Kconfig b/sound/core/Kconfig
>index b292752..efbd12b 100644
>--- a/sound/core/Kconfig
>+++ b/sound/core/Kconfig
>@@ -181,3 +181,6 @@ config SND_PCM_XRUN_DEBUG
> 	  It is usually not required, but if you have trouble with
> 	  sound clicking when system is loaded, it may help to determine
> 	  the process or driver which causes the scheduling gaps.
>+
>+config SND_VMASTER
>+	bool
>diff --git a/sound/core/Makefile b/sound/core/Makefile
>index 5a01c76..344e67f 100644
>--- a/sound/core/Makefile
>+++ b/sound/core/Makefile
>@@ -10,6 +10,7 @@ endif
> ifeq ($(CONFIG_SND_OSSEMUL),y)
> snd-objs     += sound_oss.o info_oss.o
> endif
>+snd-$(CONFIG_SND_VMASTER) += vmaster.o
> 
> snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
> 		pcm_memory.o
>diff --git a/sound/core/control.c b/sound/core/control.c
>index 86de725..5e7525c 100644
>--- a/sound/core/control.c
>+++ b/sound/core/control.c
>@@ -1487,3 +1487,30 @@ int snd_ctl_create(struct snd_card *card)
> 	snd_assert(card != NULL, return -ENXIO);
> 	return snd_device_new(card, SNDRV_DEV_CONTROL, card, &ops);
> }
>+
>+/*
>+ * Frequently used control callbacks
>+ */
>+int snd_ctl_boolean_mono_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;
>+}
>+
>+EXPORT_SYMBOL(snd_ctl_boolean_mono_info);
>+
>+int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
>+				struct snd_ctl_elem_info *uinfo)
>+{
>+	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
>+	uinfo->count = 2;
>+	uinfo->value.integer.min = 0;
>+	uinfo->value.integer.max = 1;
>+	return 0;
>+}
>+
>+EXPORT_SYMBOL(snd_ctl_boolean_stereo_info);
>diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
>new file mode 100644
>index 0000000..dfec31a
>--- /dev/null
>+++ b/sound/core/vmaster.c
>@@ -0,0 +1,372 @@
>+/*
>+ * Virtual master and slave controls
>+ *
>+ *  Copyright (c) 2008 by Takashi Iwai <tiwai@suse.de>
>+ *
>+ *  This program is free software; you can redistribute it and/or
>+ *  modify it under the terms of the GNU General Public License as
>+ *  published by the Free Software Foundation, version 2.
>+ *
>+ */
>+
>+#include <sound/driver.h>
>+#include <linux/slab.h>
>+#include <sound/core.h>
>+#include <sound/control.h>
>+#include <sound/tlv.h>
>+
>+/*
>+ * a subset of information returned via ctl info callback
>+ */
>+struct link_ctl_info {
>+	int type;		/* value type */
>+	int count;		/* item count */
>+	int min_val, max_val;	/* min, max values */
>+};
>+
>+/*
>+ * link master - this contains a list of slave controls that are
>+ * identical types, i.e. info returns the same value type and value
>+ * ranges, but may have different number of counts.
>+ *
>+ * The master control is so far only mono volume/switch for simplicity.
>+ * The same value will be applied to all slaves.
>+ */
>+struct link_master {
>+	struct list_head slaves;
>+	struct link_ctl_info info;
>+	int val;		/* the master value */
>+	unsigned int tlv[4];
>+};
>+
>+/*
>+ * link slave - this contains a slave control element
>+ *
>+ * It fakes the control callbacsk with additional attenuation by the
>+ * master control.  A slave may have either one or two channels.
>+ */
>+
>+struct link_slave {
>+	struct list_head list;
>+	struct link_master *master;
>+	struct link_ctl_info info;
>+	int vals[2];		/* current values */
>+	struct snd_kcontrol slave; /* the copy of original control entry */
>+};
>+
>+/* get the slave ctl info and save the initial values */
>+static int slave_init(struct link_slave *slave)
>+{
>+	struct snd_ctl_elem_info *uinfo;
>+	struct snd_ctl_elem_value *uctl;
>+	int err, ch;
>+
>+	if (slave->info.count)
>+		return 0; /* already initialized */
>+
>+	uinfo = kmalloc(sizeof(*uinfo), GFP_KERNEL);
>+	if (!uinfo)
>+		return -ENOMEM;
>+	uinfo->id = slave->slave.id;
>+	err = slave->slave.info(&slave->slave, uinfo);
>+	if (err < 0) {
>+		kfree(uinfo);
>+		return err;
>+	}
>+	slave->info.type = uinfo->type;
>+	slave->info.count = uinfo->count;
>+	if (slave->info.count > 2  ||
>+	    (slave->info.type != SNDRV_CTL_ELEM_TYPE_INTEGER &&
>+	     slave->info.type != SNDRV_CTL_ELEM_TYPE_BOOLEAN)) {
>+		snd_printk(KERN_ERR "invalid slave element\n");
>+		kfree(uinfo);
>+		return -EINVAL;
>+	}
>+	slave->info.min_val = uinfo->value.integer.min;
>+	slave->info.max_val = uinfo->value.integer.max;
>+	kfree(uinfo);
>+
>+	uctl = kmalloc(sizeof(*uctl), GFP_KERNEL);
>+	if (!uctl)
>+		return -ENOMEM;
>+	uctl->id = slave->slave.id;
>+	err = slave->slave.get(&slave->slave, uctl);
>+	for (ch = 0; ch < slave->info.count; ch++)
>+		slave->vals[ch] = uctl->value.integer.value[ch];
>+	kfree(uctl);
>+	return 0;
>+}
>+
>+/* initialize master volume */
>+static int master_init(struct link_master *master)
>+{
>+	struct link_slave *slave;
>+
>+	if (master->info.count)
>+		return 0; /* already initialized */
>+
>+	list_for_each_entry(slave, &master->slaves, list) {
>+		int err = slave_init(slave);
>+		if (err < 0)
>+			return err;
>+		master->info = slave->info;
>+		master->info.count = 1; /* always mono */
>+		/* set full volume as default (= no attenuation) */
>+		master->val = master->info.max_val;
>+		return 0;
>+	}
>+	return -ENOENT;
>+}
>+
>+static int slave_get_val(struct link_slave *slave,
>+			 struct snd_ctl_elem_value *ucontrol)
>+{
>+	int err, ch;
>+
>+	err = slave_init(slave);
>+	if (err < 0)
>+		return err;
>+	for (ch = 0; ch < slave->info.count; ch++)
>+		ucontrol->value.integer.value[ch] = slave->vals[ch];
>+	return 0;
>+}
>+
>+static int slave_put_val(struct link_slave *slave,
>+			 struct snd_ctl_elem_value *ucontrol)
>+{
>+	int err, ch, vol;
>+
>+	err = master_init(slave->master);
>+	if (err < 0)
>+		return err;
>+
>+	switch (slave->info.type) {
>+	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:
>+		for (ch = 0; ch < slave->info.count; ch++)
>+			ucontrol->value.integer.value[ch] &=
>+				!!slave->master->val;
>+		break;
>+	case SNDRV_CTL_ELEM_TYPE_INTEGER:
>+		for (ch = 0; ch < slave->info.count; ch++) {
>+			/* max master volume is supposed to be 0 dB */
>+			vol = ucontrol->value.integer.value[ch];
>+			vol += slave->master->val - slave->master->info.max_val;
>+			if (vol < slave->info.min_val)
>+				vol = slave->info.min_val;
>+			else if (vol > slave->info.max_val)
>+				vol = slave->info.max_val;
>+			ucontrol->value.integer.value[ch] = vol;
>+		}
>+		break;
>+	}
>+	return slave->slave.put(&slave->slave, ucontrol);
>+}
>+
>+/*
>+ * ctl callbacks for slaves
>+ */
>+static int slave_info(struct snd_kcontrol *kcontrol,
>+		      struct snd_ctl_elem_info *uinfo)
>+{
>+	struct link_slave *slave = snd_kcontrol_chip(kcontrol);
>+	return slave->slave.info(&slave->slave, uinfo);
>+}
>+
>+static int slave_get(struct snd_kcontrol *kcontrol,
>+		     struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct link_slave *slave = snd_kcontrol_chip(kcontrol);
>+	return slave_get_val(slave, ucontrol);
>+}
>+
>+static int slave_put(struct snd_kcontrol *kcontrol,
>+		     struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct link_slave *slave = snd_kcontrol_chip(kcontrol);
>+	int err, ch, changed = 0;
>+
>+	err = slave_init(slave);
>+	if (err < 0)
>+		return err;
>+	for (ch = 0; ch < slave->info.count; ch++) {
>+		if (slave->vals[ch] != ucontrol->value.integer.value[ch]) {
>+			changed = 1;
>+			slave->vals[ch] = ucontrol->value.integer.value[ch];
>+		}
>+	}
>+	if (!changed)
>+		return 0;
>+	return slave_put_val(slave, ucontrol);
>+}
>+
>+static int slave_tlv_cmd(struct snd_kcontrol *kcontrol,
>+			 int op_flag, unsigned int size,
>+			 unsigned int __user *tlv)
>+{
>+	struct link_slave *slave = snd_kcontrol_chip(kcontrol);
>+	/* FIXME: this assumes that the max volume is 0 dB */
>+	return slave->slave.tlv.c(&slave->slave, op_flag, size, tlv);
>+}
>+
>+static void slave_free(struct snd_kcontrol *kcontrol)
>+{
>+	struct link_slave *slave = snd_kcontrol_chip(kcontrol);
>+	if (slave->slave.private_free)
>+		slave->slave.private_free(&slave->slave);
>+	if (slave->master)
>+		list_del(&slave->list);
>+	kfree(slave);
>+}
>+
>+/*
>+ * Add a slave control to the group with the given master control
>+ *
>+ * All slaves must be the same type (returning the same information
>+ * via info callback).  The fucntion doesn't check it, so it's your
>+ * responsibility.
>+ *
>+ * Also, some additional limitations:
>+ * - at most two channels
>+ * - logarithmic volume control (dB level), no linear volume
>+ * - master can only attenuate the volume, no gain
>+ */
>+int snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave)
>+{
>+	struct link_master *master_link = snd_kcontrol_chip(master);
>+	struct link_slave *srec;
>+
>+	srec = kzalloc(sizeof(*srec) +
>+		       slave->count * sizeof(*slave->vd), GFP_KERNEL);
>+	if (!srec)
>+		return -ENOMEM;
>+	srec->slave = *slave;
>+	memcpy(srec->slave.vd, slave->vd, slave->count * sizeof(*slave->vd));
>+	srec->master = master_link;
>+
>+	/* override callbacks */
>+	slave->info = slave_info;
>+	slave->get = slave_get;
>+	slave->put = slave_put;
>+	if (slave->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK)
>+		slave->tlv.c = slave_tlv_cmd;
>+	slave->private_data = srec;
>+	slave->private_free = slave_free;
>+
>+	list_add_tail(&srec->list, &master_link->slaves);
>+	return 0;
>+}
>+
>+EXPORT_SYMBOL(snd_ctl_add_slave);
>+
>+/*
>+ * ctl callbacks for master controls
>+ */
>+static int master_info(struct snd_kcontrol *kcontrol,
>+		      struct snd_ctl_elem_info *uinfo)
>+{
>+	struct link_master *master = snd_kcontrol_chip(kcontrol);
>+	int ret;
>+
>+	ret = master_init(master);
>+	if (ret < 0)
>+		return ret;
>+	uinfo->type = master->info.type;
>+	uinfo->count = master->info.count;
>+	uinfo->value.integer.min = master->info.min_val;
>+	uinfo->value.integer.max = master->info.max_val;
>+	return 0;
>+}
>+
>+static int master_get(struct snd_kcontrol *kcontrol,
>+		      struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct link_master *master = snd_kcontrol_chip(kcontrol);
>+	int err = master_init(master);
>+	if (err < 0)
>+		return err;
>+	ucontrol->value.integer.value[0] = master->val;
>+	return 0;
>+}
>+
>+static int master_put(struct snd_kcontrol *kcontrol,
>+		      struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct link_master *master = snd_kcontrol_chip(kcontrol);
>+	struct link_slave *slave;
>+	struct snd_ctl_elem_value *uval;
>+	int err, old_val;
>+
>+	err = master_init(master);
>+	if (err < 0)
>+		return err;
>+	old_val = master->val;
>+	if (ucontrol->value.integer.value[0] == old_val)
>+		return 0;
>+
>+	uval = kmalloc(sizeof(*uval), GFP_KERNEL);
>+	if (!uval)
>+		return -ENOMEM;
>+	list_for_each_entry(slave, &master->slaves, list) {
>+		master->val = old_val;
>+		uval->id = slave->slave.id;
>+		slave_get_val(slave, uval);
>+		master->val = ucontrol->value.integer.value[0];
>+		slave_put_val(slave, uval);
>+	}
>+	kfree(uval);
>+	return 1;
>+}
>+
>+static void master_free(struct snd_kcontrol *kcontrol)
>+{
>+	struct link_master *master = snd_kcontrol_chip(kcontrol);
>+	struct link_slave *slave;
>+
>+	list_for_each_entry(slave, &master->slaves, list)
>+		slave->master = NULL;
>+	kfree(master);
>+}
>+
>+
>+/*
>+ * Create a virtual master control with the given name
>+ */
>+struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
>+						 const unsigned int *tlv)
>+{
>+	struct link_master *master;
>+	struct snd_kcontrol *kctl;
>+	struct snd_kcontrol_new knew;
>+
>+	memset(&knew, 0, sizeof(knew));
>+	knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
>+	knew.name = name;
>+	knew.info = master_info;
>+
>+	master = kzalloc(sizeof(*master), GFP_KERNEL);
>+	if (!master)
>+		return NULL;
>+	INIT_LIST_HEAD(&master->slaves);
>+
>+	kctl = snd_ctl_new1(&knew, master);
>+	if (!kctl) {
>+		kfree(master);
>+		return NULL;
>+	}
>+	/* override some callbacks */
>+	kctl->info = master_info;
>+	kctl->get = master_get;
>+	kctl->put = master_put;
>+	kctl->private_free = master_free;
>+
>+	/* additional (constant) TLV read */
>+	if (tlv && tlv[0] == SNDRV_CTL_TLVT_DB_SCALE) {
>+		kctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;
>+		memcpy(master->tlv, tlv, sizeof(master->tlv));
>+		kctl->tlv.p = master->tlv;
>+	}
>+
>+	return kctl;
>+}
>+
>+EXPORT_SYMBOL(snd_ctl_make_virtual_master);
>diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
>index 1bcfb3a..0bd38e8 100644
>--- a/sound/pci/Kconfig
>+++ b/sound/pci/Kconfig
>@@ -478,10 +478,28 @@ config SND_FM801_TEA575X
> 	select VIDEO_V4L1
> 	select VIDEO_DEV
> 
>+config SND_HDA_POWER_SAVE
>+	bool "Aggressive power-saving on HD-audio"
>+        help
>+	  Say Y here to enable more aggressive power-saving mode on
>+	  HD-audio driver.  The power-saving timeout can be configured
>+	  via power_save option or over sysfs on-the-fly.
>+
>+config SND_HDA_POWER_SAVE_DEFAULT
>+	int "Default time-out for HD-audio power-save mode"
>+	depends on SND_HDA_POWER_SAVE
>+	default 0
>+        help
>+	  The default time-out value in seconds for HD-audio automatic
>+	  power-save mode.  0 means to disable the power-save mode.
>+
> config SND_HDA_INTEL
> 	tristate "Intel HD Audio"
> 	depends on SND
> 	select SND_PCM
>+	select SND_VMASTER
>+	select SND_HDA_POWER_SAVE
>+	select SND_HWDEP
> 	help
> 	  Say Y here to include support for Intel "High Definition
> 	  Audio" (Azalia) motherboard devices.
>diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
>index 60d7b05..e4bfa2d 100644
>--- a/sound/pci/hda/Makefile
>+++ b/sound/pci/hda/Makefile
>@@ -1,16 +1,18 @@
>-snd-hda-intel-objs := hda_intel.o
>-snd-hda-codec-objs := hda_codec.o \
>-	hda_generic.o \
>-	patch_realtek.o \
>-	patch_cmedia.o \
>-	patch_analog.o \
>-	patch_sigmatel.o \
>-	patch_si3054.o \
>-	patch_atihdmi.o \
>-	patch_conexant.o \
>-	patch_via.o
>-ifdef CONFIG_PROC_FS
>-snd-hda-codec-objs += hda_proc.o
>-endif
>+snd-hda-intel-y := hda_intel.o
>+# since snd-hda-intel is the only driver using hda-codec,
>+# merge it into a single module although it was originally
>+# designed to be individual modules
>+snd-hda-intel-y += hda_codec.o
>+snd-hda-intel-y += hda_hwdep.o
>+snd-hda-intel-$(CONFIG_PROC_FS) += hda_proc.o
>+snd-hda-intel-y += hda_generic.o
>+snd-hda-intel-y += patch_realtek.o
>+snd-hda-intel-y += patch_cmedia.o
>+snd-hda-intel-y += patch_analog.o
>+snd-hda-intel-y += patch_sigmatel.o
>+snd-hda-intel-y += patch_si3054.o
>+snd-hda-intel-y += patch_atihdmi.o
>+snd-hda-intel-y += patch_conexant.o
>+snd-hda-intel-y += patch_via.o
> 
>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o snd-hda-codec.o
>+obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o
>diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
>index e9c4c3f..c66e2c0 100644
>--- a/sound/pci/hda/hda_codec.c
>+++ b/sound/pci/hda/hda_codec.c
>@@ -24,21 +24,23 @@
> #include <linux/delay.h>
> #include <linux/slab.h>
> #include <linux/pci.h>
>-#include <linux/moduleparam.h>
> #include <linux/mutex.h>
>-#include <linux/workqueue.h>
> #include <sound/core.h>
> #include "hda_codec.h"
> #include <sound/asoundef.h>
> #include <sound/tlv.h>
> #include <sound/initval.h>
> #include "hda_local.h"
>-
>-
>-MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
>-MODULE_DESCRIPTION("Universal interface for High Definition Audio Codec");
>-MODULE_LICENSE("GPL");
>-
>+#include <sound/hda_hwdep.h>
>+#include "hda_patch.h"	/* codec presets */
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+/* define this option here to hide as static */
>+static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
>+module_param(power_save, int, 0644);
>+MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
>+		 "(in second, 0 = disable).");
>+#endif
> 
> /*
>  * vendor / preset table
>@@ -51,20 +53,41 @@ struct hda_vendor_id {
> 
> /* codec vendor labels */
> static struct hda_vendor_id hda_vendor_ids[] = {
>-	{ 0x10ec, "Realtek" },
>+	{ 0x1002, "ATI" },
> 	{ 0x1057, "Motorola" },
>+	{ 0x1095, "Silicon Image" },
>+	{ 0x10ec, "Realtek" },
> 	{ 0x1106, "VIA" },
>+	{ 0x111d, "IDT" },
>+	{ 0x11c1, "LSI" },
> 	{ 0x11d4, "Analog Devices" },
> 	{ 0x13f6, "C-Media" },
> 	{ 0x14f1, "Conexant" },
>+	{ 0x17e8, "Chrontel" },
>+	{ 0x1854, "LG" },
> 	{ 0x434d, "C-Media" },
> 	{ 0x8384, "SigmaTel" },
> 	{} /* terminator */
> };
> 
>-/* codec presets */
>-#include "hda_patch.h"
>+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_si3054,
>+	snd_hda_preset_atihdmi,
>+	snd_hda_preset_conexant,
>+	snd_hda_preset_via,
>+	NULL
>+};
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static void hda_power_work(void *);
>+static void hda_keep_power_on(struct hda_codec *codec);
>+#else
>+static inline void hda_keep_power_on(struct hda_codec *codec) {}
>+#endif
> 
> /**
>  * snd_hda_codec_read - send a command and get the response
>@@ -78,21 +101,22 @@ static struct hda_vendor_id hda_vendor_ids[] = {
>  *
>  * Returns the obtained response value, or -1 for an error.
>  */
>-unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid, int direct,
>+unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid,
>+				int direct,
> 				unsigned int verb, unsigned int parm)
> {
> 	unsigned int res;
>+	snd_hda_power_up(codec);
> 	mutex_lock(&codec->bus->cmd_mutex);
>-	if (! codec->bus->ops.command(codec, nid, direct, verb, parm))
>+	if (!codec->bus->ops.command(codec, nid, direct, verb, parm))
> 		res = codec->bus->ops.get_response(codec);
> 	else
> 		res = (unsigned int)-1;
> 	mutex_unlock(&codec->bus->cmd_mutex);
>+	snd_hda_power_down(codec);
> 	return res;
> }
> 
>-EXPORT_SYMBOL(snd_hda_codec_read);
>-
> /**
>  * snd_hda_codec_write - send a single command without waiting for response
>  * @codec: the HDA codec
>@@ -109,14 +133,14 @@ int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct,
> 			 unsigned int verb, unsigned int parm)
> {
> 	int err;
>+	snd_hda_power_up(codec);
> 	mutex_lock(&codec->bus->cmd_mutex);
> 	err = codec->bus->ops.command(codec, nid, direct, verb, parm);
> 	mutex_unlock(&codec->bus->cmd_mutex);
>+	snd_hda_power_down(codec);
> 	return err;
> }
> 
>-EXPORT_SYMBOL(snd_hda_codec_write);
>-
> /**
>  * snd_hda_sequence_write - sequence writes
>  * @codec: the HDA codec
>@@ -131,8 +155,6 @@ void snd_hda_sequence_write(struct hda_codec *codec, const struct hda_verb *seq)
> 		snd_hda_codec_write(codec, seq->nid, 0, seq->verb, seq->param);
> }
> 
>-EXPORT_SYMBOL(snd_hda_sequence_write);
>-
> /**
>  * snd_hda_get_sub_nodes - get the range of sub nodes
>  * @codec: the HDA codec
>@@ -142,17 +164,18 @@ EXPORT_SYMBOL(snd_hda_sequence_write);
>  * Parse the NID and store the start NID of its sub-nodes.
>  * Returns the number of sub-nodes.
>  */
>-int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *start_id)
>+int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid,
>+			  hda_nid_t *start_id)
> {
> 	unsigned int parm;
> 
> 	parm = snd_hda_param_read(codec, nid, AC_PAR_NODE_COUNT);
>+	if (parm == -1)
>+		return 0;
> 	*start_id = (parm >> 16) & 0x7fff;
> 	return (int)(parm & 0x7fff);
> }
> 
>-EXPORT_SYMBOL(snd_hda_get_sub_nodes);
>-
> /**
>  * snd_hda_get_connections - get connection list
>  * @codec: the HDA codec
>@@ -188,12 +211,13 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
> 	conn_len = parm & AC_CLIST_LENGTH;
> 	mask = (1 << (shift-1)) - 1;
> 
>-	if (! conn_len)
>+	if (!conn_len)
> 		return 0; /* no connection */
> 
> 	if (conn_len == 1) {
> 		/* single connection */
>-		parm = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_LIST, 0);
>+		parm = snd_hda_codec_read(codec, nid, 0,
>+					  AC_VERB_GET_CONNECT_LIST, 0);
> 		conn_list[0] = parm & mask;
> 		return 1;
> 	}
>@@ -208,18 +232,21 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
> 		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 */
>+		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);
>+			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");
>+					snd_printk(KERN_ERR
>+						   "Too many connections\n");
> 					return -EINVAL;
> 				}
> 				conn_list[conns++] = n;
>@@ -254,7 +281,8 @@ int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex)
> 	struct hda_bus_unsolicited *unsol;
> 	unsigned int wp;
> 
>-	if ((unsol = bus->unsol) == NULL)
>+	unsol = bus->unsol;
>+	if (!unsol)
> 		return 0;
> 
> 	wp = (unsol->wp + 1) % HDA_UNSOL_QUEUE_SIZE;
>@@ -264,20 +292,20 @@ int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex)
> 	unsol->queue[wp] = res;
> 	unsol->queue[wp + 1] = res_ex;
> 
>-	queue_work(unsol->workq, &unsol->work);
>+	schedule_work(&unsol->work);
> 
> 	return 0;
> }
> 
>-EXPORT_SYMBOL(snd_hda_queue_unsol_event);
>-
> /*
>  * process queueud unsolicited events
>  */
> static void process_unsol_events(void *data)
> {
>-	struct hda_bus *bus = data;
>-	struct hda_bus_unsolicited *unsol = bus->unsol;
>+	struct work_struct *work = data;
>+	struct hda_bus_unsolicited *unsol =
>+		container_of(work, struct hda_bus_unsolicited, work);
>+	struct hda_bus *bus = unsol->bus;
> 	struct hda_codec *codec;
> 	unsigned int rp, caddr, res;
> 
>@@ -287,7 +315,7 @@ static void process_unsol_events(void *data)
> 		rp <<= 1;
> 		res = unsol->queue[rp];
> 		caddr = unsol->queue[rp + 1];
>-		if (! (caddr & (1 << 4))) /* no unsolicited event? */
>+		if (!(caddr & (1 << 4))) /* no unsolicited event? */
> 			continue;
> 		codec = bus->caddr_tbl[caddr & 0x0f];
> 		if (codec && codec->patch_ops.unsol_event)
>@@ -298,7 +326,7 @@ static void process_unsol_events(void *data)
> /*
>  * initialize unsolicited queue
>  */
>-static int init_unsol_queue(struct hda_bus *bus)
>+static int __devinit init_unsol_queue(struct hda_bus *bus)
> {
> 	struct hda_bus_unsolicited *unsol;
> 
>@@ -306,17 +334,13 @@ static int init_unsol_queue(struct hda_bus *bus)
> 		return 0;
> 
> 	unsol = kzalloc(sizeof(*unsol), GFP_KERNEL);
>-	if (! unsol) {
>-		snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n");
>+	if (!unsol) {
>+		snd_printk(KERN_ERR "hda_codec: "
>+			   "can't allocate unsolicited queue\n");
> 		return -ENOMEM;
> 	}
>-	unsol->workq = create_singlethread_workqueue("hda_codec");
>-	if (! unsol->workq) {
>-		snd_printk(KERN_ERR "hda_codec: can't create workqueue\n");
>-		kfree(unsol);
>-		return -ENOMEM;
>-	}
>-	INIT_WORK(&unsol->work, process_unsol_events, bus);
>+	INIT_WORK(&unsol->work, process_unsol_events, &unsol->work);
>+	unsol->bus = bus;
> 	bus->unsol = unsol;
> 	return 0;
> }
>@@ -328,16 +352,15 @@ static void snd_hda_codec_free(struct hda_codec *codec);
> 
> static int snd_hda_bus_free(struct hda_bus *bus)
> {
>-	struct list_head *p, *n;
>+	struct hda_codec *codec, *n;
> 
>-	if (! bus)
>+	if (!bus)
> 		return 0;
> 	if (bus->unsol) {
>-		destroy_workqueue(bus->unsol->workq);
>+		flush_scheduled_work();
> 		kfree(bus->unsol);
> 	}
>-	list_for_each_safe(p, n, &bus->codec_list) {
>-		struct hda_codec *codec = list_entry(p, struct hda_codec, list);
>+	list_for_each_entry_safe(codec, n, &bus->codec_list, list) {
> 		snd_hda_codec_free(codec);
> 	}
> 	if (bus->ops.private_free)
>@@ -360,8 +383,9 @@ static int snd_hda_bus_dev_free(struct snd_device *device)
>  *
>  * Returns 0 if successful, or a negative error code.
>  */
>-int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,
>-		    struct hda_bus **busp)
>+int __devinit snd_hda_bus_new(struct snd_card *card,
>+			      const struct hda_bus_template *temp,
>+			      struct hda_bus **busp)
> {
> 	struct hda_bus *bus;
> 	int err;
>@@ -390,7 +414,8 @@ int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,
> 	mutex_init(&bus->cmd_mutex);
> 	INIT_LIST_HEAD(&bus->codec_list);
> 
>-	if ((err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops)) < 0) {
>+	err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops);
>+	if (err < 0) {
> 		snd_hda_bus_free(bus);
> 		return err;
> 	}
>@@ -399,22 +424,35 @@ int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,
> 	return 0;
> }
> 
>-EXPORT_SYMBOL(snd_hda_bus_new);
>+#ifdef CONFIG_SND_HDA_GENERIC
>+#define is_generic_config(codec) \
>+	(codec->bus->modelname && !strcmp(codec->bus->modelname, "generic"))
>+#else
>+#define is_generic_config(codec)	0
>+#endif
> 
> /*
>  * find a matching codec preset
>  */
>-static const struct hda_codec_preset *find_codec_preset(struct hda_codec *codec)
>+static const struct hda_codec_preset __devinit *
>+find_codec_preset(struct hda_codec *codec)
> {
> 	const struct hda_codec_preset **tbl, *preset;
> 
>+	if (is_generic_config(codec))
>+		return NULL; /* use the generic parser */
>+
> 	for (tbl = hda_preset_tables; *tbl; tbl++) {
> 		for (preset = *tbl; preset->id; preset++) {
> 			u32 mask = preset->mask;
>-			if (! mask)
>+			if (preset->afg && preset->afg != codec->afg)
>+				continue;
>+			if (preset->mfg && preset->mfg != codec->mfg)
>+				continue;
>+			if (!mask)
> 				mask = ~0;
> 			if (preset->id == (codec->vendor_id & mask) &&
>-			    (! preset->rev ||
>+			    (!preset->rev ||
> 			     preset->rev == codec->revision_id))
> 				return preset;
> 		}
>@@ -439,27 +477,30 @@ void snd_hda_get_codec_name(struct hda_codec *codec,
> 			break;
> 		}
> 	}
>-	if (! vendor) {
>+	if (!vendor) {
> 		sprintf(tmp, "Generic %04x", vendor_id);
> 		vendor = tmp;
> 	}
> 	if (codec->preset && codec->preset->name)
> 		snprintf(name, namelen, "%s %s", vendor, codec->preset->name);
> 	else
>-		snprintf(name, namelen, "%s ID %x", vendor, codec->vendor_id & 0xffff);
>+		snprintf(name, namelen, "%s ID %x", vendor,
>+			 codec->vendor_id & 0xffff);
> }
> 
> /*
>  * look for an AFG and MFG nodes
>  */
>-static void setup_fg_nodes(struct hda_codec *codec)
>+static void __devinit setup_fg_nodes(struct hda_codec *codec)
> {
> 	int i, total_nodes;
> 	hda_nid_t nid;
> 
> 	total_nodes = snd_hda_get_sub_nodes(codec, AC_NODE_ROOT, &nid);
> 	for (i = 0; i < total_nodes; i++, nid++) {
>-		switch((snd_hda_param_read(codec, nid, AC_PAR_FUNCTION_TYPE) & 0xff)) {
>+		unsigned int func;
>+		func = snd_hda_param_read(codec, nid, AC_PAR_FUNCTION_TYPE);
>+		switch (func & 0xff) {
> 		case AC_GRP_AUDIO_FUNCTION:
> 			codec->afg = nid;
> 			break;
>@@ -483,7 +524,7 @@ static int read_widget_caps(struct hda_codec *codec, hda_nid_t fg_node)
> 	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)
>+	if (!codec->wcaps)
> 		return -ENOMEM;
> 	nid = codec->start_nid;
> 	for (i = 0; i < codec->num_nodes; i++, nid++)
>@@ -493,24 +534,31 @@ static int read_widget_caps(struct hda_codec *codec, hda_nid_t fg_node)
> }
> 
> 
>+static void init_hda_cache(struct hda_cache_rec *cache,
>+			   unsigned int record_size);
>+static void free_hda_cache(struct hda_cache_rec *cache);
>+
> /*
>  * codec destructor
>  */
> static void snd_hda_codec_free(struct hda_codec *codec)
> {
>-	if (! codec)
>+	if (!codec)
> 		return;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	cancel_delayed_work(&codec->power_work);
>+	flush_scheduled_work();
>+#endif
> 	list_del(&codec->list);
> 	codec->bus->caddr_tbl[codec->addr] = NULL;
> 	if (codec->patch_ops.free)
> 		codec->patch_ops.free(codec);
>-	kfree(codec->amp_info);
>+	free_hda_cache(&codec->amp_cache);
>+	free_hda_cache(&codec->cmd_cache);
> 	kfree(codec->wcaps);
> 	kfree(codec);
> }
> 
>-static void init_amp_hash(struct hda_codec *codec);
>-
> /**
>  * snd_hda_codec_new - create a HDA codec
>  * @bus: the bus to assign
>@@ -519,8 +567,8 @@ static void init_amp_hash(struct hda_codec *codec);
>  *
>  * Returns 0 if successful, or a negative error code.
>  */
>-int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
>-		      struct hda_codec **codecp)
>+int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
>+				struct hda_codec **codecp)
> {
> 	struct hda_codec *codec;
> 	char component[13];
>@@ -530,7 +578,8 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
> 	snd_assert(codec_addr <= HDA_MAX_CODEC_ADDRESS, return -EINVAL);
> 
> 	if (bus->caddr_tbl[codec_addr]) {
>-		snd_printk(KERN_ERR "hda_codec: address 0x%x is already occupied\n", codec_addr);
>+		snd_printk(KERN_ERR "hda_codec: "
>+			   "address 0x%x is already occupied\n", codec_addr);
> 		return -EBUSY;
> 	}
> 
>@@ -543,23 +592,36 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
> 	codec->bus = bus;
> 	codec->addr = codec_addr;
> 	mutex_init(&codec->spdif_mutex);
>-	init_amp_hash(codec);
>+	init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
>+	init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	INIT_WORK(&codec->power_work, hda_power_work, codec);
>+	/* snd_hda_codec_new() marks the codec as power-up, and leave it as is.
>+	 * the caller has to power down appropriatley after initialization
>+	 * phase.
>+	 */
>+	hda_keep_power_on(codec);
>+#endif
> 
> 	list_add_tail(&codec->list, &bus->codec_list);
> 	bus->caddr_tbl[codec_addr] = codec;
> 
>-	codec->vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_VENDOR_ID);
>+	codec->vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT,
>+					      AC_PAR_VENDOR_ID);
> 	if (codec->vendor_id == -1)
> 		/* read again, hopefully the access method was corrected
> 		 * in the last read...
> 		 */
> 		codec->vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT,
> 						      AC_PAR_VENDOR_ID);
>-	codec->subsystem_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_SUBSYSTEM_ID);
>-	codec->revision_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_REV_ID);
>+	codec->subsystem_id = snd_hda_param_read(codec, AC_NODE_ROOT,
>+						 AC_PAR_SUBSYSTEM_ID);
>+	codec->revision_id = snd_hda_param_read(codec, AC_NODE_ROOT,
>+						AC_PAR_REV_ID);
> 
> 	setup_fg_nodes(codec);
>-	if (! codec->afg && ! codec->mfg) {
>+	if (!codec->afg && !codec->mfg) {
> 		snd_printdd("hda_codec: no AFG or MFG node found\n");
> 		snd_hda_codec_free(codec);
> 		return -ENODEV;
>@@ -571,22 +633,34 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
> 		return -ENOMEM;
> 	}
> 
>-	if (! codec->subsystem_id) {
>+	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);
>+		codec->subsystem_id =
>+			snd_hda_codec_read(codec, nid, 0,
>+					   AC_VERB_GET_SUBSYSTEM_ID, 0);
> 	}
> 
> 	codec->preset = find_codec_preset(codec);
>-	if (! *bus->card->mixername)
>+	/* audio codec should override the mixer name */
>+	if (codec->afg || !*bus->card->mixername)
> 		snd_hda_get_codec_name(codec, bus->card->mixername,
> 				       sizeof(bus->card->mixername));
> 
>-	if (codec->preset && codec->preset->patch)
>-		err = codec->preset->patch(codec);
>-	else
>+	if (is_generic_config(codec)) {
> 		err = snd_hda_parse_generic_codec(codec);
>+		goto patched;
>+	}
>+	if (codec->preset && codec->preset->patch) {
>+		err = codec->preset->patch(codec);
>+		goto patched;
>+	}
>+
>+	/* call the default parser */
>+	err = snd_hda_parse_generic_codec(codec);
>+	if (err < 0)
>+		printk(KERN_ERR "hda-codec: No codec parser is available\n");
>+
>+ patched:
> 	if (err < 0) {
> 		snd_hda_codec_free(codec);
> 		return err;
>@@ -596,6 +670,9 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
> 		init_unsol_queue(bus);
> 
> 	snd_hda_codec_proc_new(codec);
>+#ifdef CONFIG_SND_HDA_HWDEP
>+	snd_hda_create_hwdep(codec);
>+#endif
> 
> 	sprintf(component, "HDA:%08x", codec->vendor_id);
> 	snd_component_add(codec->bus->card, component);
>@@ -605,8 +682,6 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
> 	return 0;
> }
> 
>-EXPORT_SYMBOL(snd_hda_codec_new);
>-
> /**
>  * snd_hda_codec_setup_stream - set up the codec for streaming
>  * @codec: the CODEC to set up
>@@ -615,13 +690,15 @@ EXPORT_SYMBOL(snd_hda_codec_new);
>  * @channel_id: channel id to pass, zero based.
>  * @format: stream format.
>  */
>-void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, u32 stream_tag,
>+void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
>+				u32 stream_tag,
> 				int channel_id, int format)
> {
>-	if (! nid)
>+	if (!nid)
> 		return;
> 
>-	snd_printdd("hda_codec_setup_stream: NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n",
>+	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);
>@@ -629,7 +706,18 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, u32 stre
> 	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, format);
> }
> 
>-EXPORT_SYMBOL(snd_hda_codec_setup_stream);
>+void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid)
>+{
>+	if (!nid)
>+		return;
>+
>+	snd_printdd("hda_codec_cleanup_stream: NID=0x%x\n", nid);
>+	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID, 0);
>+#if 0 /* keep the format */
>+	msleep(1);
>+	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, 0);
>+#endif
>+}
> 
> /*
>  * amp access functions
>@@ -641,93 +729,128 @@ EXPORT_SYMBOL(snd_hda_codec_setup_stream);
> #define INFO_AMP_VOL(ch)	(1 << (1 + (ch)))
> 
> /* initialize the hash table */
>-static void init_amp_hash(struct hda_codec *codec)
>+static void __devinit init_hda_cache(struct hda_cache_rec *cache,
>+				     unsigned int record_size)
>+{
>+	memset(cache, 0, sizeof(*cache));
>+	memset(cache->hash, 0xff, sizeof(cache->hash));
>+	cache->record_size = record_size;
>+}
>+
>+static void free_hda_cache(struct hda_cache_rec *cache)
> {
>-	memset(codec->amp_hash, 0xff, sizeof(codec->amp_hash));
>-	codec->num_amp_entries = 0;
>-	codec->amp_info_size = 0;
>-	codec->amp_info = NULL;
>+	kfree(cache->buffer);
> }
> 
> /* query the hash.  allocate an entry if not found. */
>-static struct hda_amp_info *get_alloc_amp_hash(struct hda_codec *codec, u32 key)
>+static struct hda_cache_head  *get_alloc_hash(struct hda_cache_rec *cache,
>+					      u32 key)
> {
>-	u16 idx = key % (u16)ARRAY_SIZE(codec->amp_hash);
>-	u16 cur = codec->amp_hash[idx];
>-	struct hda_amp_info *info;
>+	u16 idx = key % (u16)ARRAY_SIZE(cache->hash);
>+	u16 cur = cache->hash[idx];
>+	struct hda_cache_head *info;
> 
> 	while (cur != 0xffff) {
>-		info = &codec->amp_info[cur];
>+		info = (struct hda_cache_head *)(cache->buffer +
>+						 cur * cache->record_size);
> 		if (info->key == key)
> 			return info;
> 		cur = info->next;
> 	}
> 
> 	/* add a new hash entry */
>-	if (codec->num_amp_entries >= codec->amp_info_size) {
>+	if (cache->num_entries >= cache->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");
>+		unsigned int new_size = cache->size + 64;
>+		void *new_buffer;
>+		new_buffer = kcalloc(new_size, cache->record_size, GFP_KERNEL);
>+		if (!new_buffer) {
>+			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);
>+		if (cache->buffer) {
>+			memcpy(new_buffer, cache->buffer,
>+			       cache->size * cache->record_size);
>+			kfree(cache->buffer);
> 		}
>-		codec->amp_info_size = new_size;
>-		codec->amp_info = new_info;
>+		cache->size = new_size;
>+		cache->buffer = new_buffer;
> 	}
>-	cur = codec->num_amp_entries++;
>-	info = &codec->amp_info[cur];
>+	cur = cache->num_entries++;
>+	info = (struct hda_cache_head *)(cache->buffer +
>+					 cur * cache->record_size);
> 	info->key = key;
>-	info->status = 0; /* not initialized yet */
>-	info->next = codec->amp_hash[idx];
>-	codec->amp_hash[idx] = cur;
>+	info->val = 0;
>+	info->next = cache->hash[idx];
>+	cache->hash[idx] = cur;
> 
> 	return info;
> }
> 
>+/* query and allocate an amp hash entry */
>+static inline struct hda_amp_info *
>+get_alloc_amp_hash(struct hda_codec *codec, u32 key)
>+{
>+	return (struct hda_amp_info *)get_alloc_hash(&codec->amp_cache, key);
>+}
>+
> /*
>  * query AMP capabilities for the given widget and direction
>  */
>-static u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)
>+u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)
> {
>-	struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, 0));
>+	struct hda_amp_info *info;
> 
>-	if (! info)
>+	info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, 0));
>+	if (!info)
> 		return 0;
>-	if (! (info->status & INFO_AMP_CAPS)) {
>-		if (! (get_wcaps(codec, nid) & AC_WCAP_AMP_OVRD))
>+	if (!(info->head.val & 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;
>+		info->amp_caps = snd_hda_param_read(codec, nid,
>+						    direction == HDA_OUTPUT ?
>+						    AC_PAR_AMP_OUT_CAP :
>+						    AC_PAR_AMP_IN_CAP);
>+		if (info->amp_caps)
>+			info->head.val |= INFO_AMP_CAPS;
> 	}
> 	return info->amp_caps;
> }
> 
>+int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,
>+			      unsigned int caps)
>+{
>+	struct hda_amp_info *info;
>+
>+	info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, dir, 0));
>+	if (!info)
>+		return -EINVAL;
>+	info->amp_caps = caps;
>+	info->head.val |= INFO_AMP_CAPS;
>+	return 0;
>+}
>+
> /*
>  * read the current volume to info
>  * if the cache exists, read the cache value.
>  */
>-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)
>+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))
>+	if (info->head.val & 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);
>+	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);
>+	info->head.val |= INFO_AMP_VOL(ch);
> 	return info->vol[ch];
> }
> 
>@@ -735,7 +858,8 @@ static unsigned int get_vol_mute(struct hda_codec *codec, struct hda_amp_info *i
>  * write the current volume in info to the h/w and update the cache
>  */
> 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)
>+			 hda_nid_t nid, int ch, int direction, int index,
>+			 int val)
> {
> 	u32 parm;
> 
>@@ -753,8 +877,9 @@ static void put_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,
> 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)
>+	struct hda_amp_info *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);
> }
>@@ -765,18 +890,57 @@ int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch,
> 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));
>+	struct hda_amp_info *info;
> 
>-	if (! 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)
>+	if (info->vol[ch] == val)
> 		return 0;
> 	put_vol_mute(codec, info, nid, ch, direction, idx, val);
> 	return 1;
> }
> 
>+/*
>+ * update the AMP stereo with the same mask and value
>+ */
>+int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid,
>+			     int direction, int idx, int mask, int val)
>+{
>+	int ch, ret = 0;
>+	for (ch = 0; ch < 2; ch++)
>+		ret |= snd_hda_codec_amp_update(codec, nid, ch, direction,
>+						idx, mask, val);
>+	return ret;
>+}
>+
>+#ifdef SND_HDA_NEEDS_RESUME
>+/* resume the all amp commands from the cache */
>+void snd_hda_codec_resume_amp(struct hda_codec *codec)
>+{
>+	struct hda_amp_info *buffer = codec->amp_cache.buffer;
>+	int i;
>+
>+	for (i = 0; i < codec->amp_cache.size; i++, buffer++) {
>+		u32 key = buffer->head.key;
>+		hda_nid_t nid;
>+		unsigned int idx, dir, ch;
>+		if (!key)
>+			continue;
>+		nid = key & 0xff;
>+		idx = (key >> 16) & 0xff;
>+		dir = (key >> 24) & 0xff;
>+		for (ch = 0; ch < 2; ch++) {
>+			if (!(buffer->head.val & INFO_AMP_VOL(ch)))
>+				continue;
>+			put_vol_mute(codec, buffer, nid, ch, dir, idx,
>+				     buffer->vol[ch]);
>+		}
>+	}
>+}
>+#endif /* SND_HDA_NEEDS_RESUME */
> 
> /*
>  * AMP control callbacks
>@@ -788,7 +952,8 @@ int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
> #define get_amp_index(kc)	(((kc)->private_value >> 19) & 0xf)
> 
> /* volume */
>-int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *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);
> 	u16 nid = get_amp_nid(kcontrol);
>@@ -797,9 +962,12 @@ int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_
> 	u32 caps;
> 
> 	caps = query_amp_caps(codec, nid, dir);
>-	caps = (caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT; /* num steps */
>-	if (! caps) {
>-		printk(KERN_WARNING "hda_codec: num_steps = 0 for NID=0x%x\n", nid);
>+	/* num steps */
>+	caps = (caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT;
>+	if (!caps) {
>+		printk(KERN_WARNING "hda_codec: "
>+		       "num_steps = 0 for NID=0x%x (ctl = %s)\n", nid,
>+		       kcontrol->id.name);
> 		return -EINVAL;
> 	}
> 	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
>@@ -809,7 +977,8 @@ int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_
> 	return 0;
> }
> 
>-int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *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);
> 	hda_nid_t nid = get_amp_nid(kcontrol);
>@@ -819,13 +988,16 @@ int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_e
> 	long *valp = ucontrol->value.integer.value;
> 
> 	if (chs & 1)
>-		*valp++ = snd_hda_codec_amp_read(codec, nid, 0, dir, idx) & 0x7f;
>+		*valp++ = snd_hda_codec_amp_read(codec, nid, 0, dir, idx)
>+			& HDA_AMP_VOLMASK;
> 	if (chs & 2)
>-		*valp = snd_hda_codec_amp_read(codec, nid, 1, dir, idx) & 0x7f;
>+		*valp = snd_hda_codec_amp_read(codec, nid, 1, dir, idx)
>+			& HDA_AMP_VOLMASK;
> 	return 0;
> }
> 
>-int snd_hda_mixer_amp_volume_put(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)
> {
> 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
> 	hda_nid_t nid = get_amp_nid(kcontrol);
>@@ -835,6 +1007,7 @@ int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
> 	long *valp = ucontrol->value.integer.value;
> 	int change = 0;
> 
>+	snd_hda_power_up(codec);
> 	if (chs & 1) {
> 		change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
> 						  0x7f, *valp);
>@@ -843,6 +1016,7 @@ int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
> 	if (chs & 2)
> 		change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
> 						   0x7f, *valp);
>+	snd_hda_power_down(codec);
> 	return change;
> }
> 
>@@ -857,7 +1031,8 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
> 	if (size < 4 * sizeof(unsigned int))
> 		return -ENOMEM;
> 	caps = query_amp_caps(codec, nid, dir);
>-	val2 = (((caps & AC_AMPCAP_STEP_SIZE) >> AC_AMPCAP_STEP_SIZE_SHIFT) + 1) * 25;
>+	val2 = (caps & AC_AMPCAP_STEP_SIZE) >> AC_AMPCAP_STEP_SIZE_SHIFT;
>+	val2 = (val2 + 1) * 25;
> 	val1 = -((caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT);
> 	val1 = ((int)val1) * ((int)val2);
> 	if (put_user(SNDRV_CTL_TLVT_DB_SCALE, _tlv))
>@@ -871,8 +1046,83 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
> 	return 0;
> }
> 
>+/*
>+ * set (static) TLV for virtual master volume; recalculated as max 0dB
>+ */
>+void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir,
>+			     unsigned int *tlv)
>+{
>+	u32 caps;
>+	int nums, step;
>+
>+	caps = query_amp_caps(codec, nid, dir);
>+	nums = (caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT;
>+	step = (caps & AC_AMPCAP_STEP_SIZE) >> AC_AMPCAP_STEP_SIZE_SHIFT;
>+	step = (step + 1) * 25;
>+	tlv[0] = SNDRV_CTL_TLVT_DB_SCALE;
>+	tlv[1] = 2 * sizeof(unsigned int);
>+	tlv[2] = -nums * step;
>+	tlv[3] = step;
>+}
>+
>+/* find a mixer control element with the given name */
>+static struct snd_kcontrol *
>+_snd_hda_find_mixer_ctl(struct hda_codec *codec,
>+			const char *name, int idx)
>+{
>+	struct snd_ctl_elem_id id;
>+	memset(&id, 0, sizeof(id));
>+	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
>+	id.index = idx;
>+	strcpy(id.name, name);
>+	return snd_ctl_find_id(codec->bus->card, &id);
>+}
>+
>+struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
>+					    const char *name)
>+{
>+	return _snd_hda_find_mixer_ctl(codec, name, 0);
>+}
>+
>+/* create a virtual master control and add slaves */
>+int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
>+			unsigned int *tlv, const char **slaves)
>+{
>+	struct snd_kcontrol *kctl;
>+	const char **s;
>+	int err;
>+
>+	for (s = slaves; *s && !snd_hda_find_mixer_ctl(codec, *s); s++)
>+		;
>+	if (!*s) {
>+		snd_printdd("No slave found for %s\n", name);
>+		return 0;
>+	}
>+	kctl = snd_ctl_make_virtual_master(name, tlv);
>+	if (!kctl)
>+		return -ENOMEM;
>+	err = snd_ctl_add(codec->bus->card, kctl);
>+	if (err < 0)
>+		return err;
>+	
>+	for (s = slaves; *s; s++) {
>+		struct snd_kcontrol *sctl;
>+
>+		sctl = snd_hda_find_mixer_ctl(codec, *s);
>+		if (!sctl) {
>+			snd_printdd("Cannot find slave %s, skipped\n", *s);
>+			continue;
>+		}
>+		err = snd_ctl_add_slave(kctl, sctl);
>+		if (err < 0)
>+			return err;
>+	}
>+	return 0;
>+}
>+
> /* switch */
>-int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
>+int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol,
>+				  struct snd_ctl_elem_info *uinfo)
> {
> 	int chs = get_amp_channels(kcontrol);
> 
>@@ -883,7 +1133,8 @@ int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_
> 	return 0;
> }
> 
>-int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *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);
> 	hda_nid_t nid = get_amp_nid(kcontrol);
>@@ -893,13 +1144,16 @@ int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_e
> 	long *valp = ucontrol->value.integer.value;
> 
> 	if (chs & 1)
>-		*valp++ = (snd_hda_codec_amp_read(codec, nid, 0, dir, idx) & 0x80) ? 0 : 1;
>+		*valp++ = (snd_hda_codec_amp_read(codec, nid, 0, dir, idx) &
>+			   HDA_AMP_MUTE) ? 0 : 1;
> 	if (chs & 2)
>-		*valp = (snd_hda_codec_amp_read(codec, nid, 1, dir, idx) & 0x80) ? 0 : 1;
>+		*valp = (snd_hda_codec_amp_read(codec, nid, 1, dir, idx) &
>+			 HDA_AMP_MUTE) ? 0 : 1;
> 	return 0;
> }
> 
>-int snd_hda_mixer_amp_switch_put(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)
> {
> 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
> 	hda_nid_t nid = get_amp_nid(kcontrol);
>@@ -909,15 +1163,22 @@ int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
> 	long *valp = ucontrol->value.integer.value;
> 	int change = 0;
> 
>+	snd_hda_power_up(codec);
> 	if (chs & 1) {
> 		change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
>-						  0x80, *valp ? 0 : 0x80);
>+						  HDA_AMP_MUTE,
>+						  *valp ? 0 : HDA_AMP_MUTE);
> 		valp++;
> 	}
> 	if (chs & 2)
> 		change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
>-						   0x80, *valp ? 0 : 0x80);
>-	
>+						   HDA_AMP_MUTE,
>+						   *valp ? 0 : HDA_AMP_MUTE);
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	if (codec->patch_ops.check_power_status)
>+		codec->patch_ops.check_power_status(codec, nid);
>+#endif
>+	snd_hda_power_down(codec);
> 	return change;
> }
> 
>@@ -930,7 +1191,8 @@ int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
> #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)
>+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;
>@@ -945,7 +1207,8 @@ int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_
> 	return err;
> }
> 
>-int snd_hda_mixer_bind_switch_put(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)
> {
> 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
> 	unsigned long pval;
>@@ -955,7 +1218,8 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
> 	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);
>+		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;
>@@ -976,8 +1240,8 @@ int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
> 	struct hda_bind_ctls *c;
> 	int err;
> 
>-	c = (struct hda_bind_ctls *)kcontrol->private_value;
> 	mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
>+	c = (struct hda_bind_ctls *)kcontrol->private_value;
> 	kcontrol->private_value = *c->values;
> 	err = c->ops->info(kcontrol, uinfo);
> 	kcontrol->private_value = (long)c;
>@@ -992,8 +1256,8 @@ int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,
> 	struct hda_bind_ctls *c;
> 	int err;
> 
>-	c = (struct hda_bind_ctls *)kcontrol->private_value;
> 	mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
>+	c = (struct hda_bind_ctls *)kcontrol->private_value;
> 	kcontrol->private_value = *c->values;
> 	err = c->ops->get(kcontrol, ucontrol);
> 	kcontrol->private_value = (long)c;
>@@ -1009,8 +1273,8 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
> 	unsigned long *vals;
> 	int err = 0, change = 0;
> 
>-	c = (struct hda_bind_ctls *)kcontrol->private_value;
> 	mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
>+	c = (struct hda_bind_ctls *)kcontrol->private_value;
> 	for (vals = c->values; *vals; vals++) {
> 		kcontrol->private_value = *vals;
> 		err = c->ops->put(kcontrol, ucontrol);
>@@ -1030,8 +1294,8 @@ int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag,
> 	struct hda_bind_ctls *c;
> 	int err;
> 
>-	c = (struct hda_bind_ctls *)kcontrol->private_value;
> 	mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
>+	c = (struct hda_bind_ctls *)kcontrol->private_value;
> 	kcontrol->private_value = *c->values;
> 	err = c->ops->tlv(kcontrol, op_flag, size, tlv);
> 	kcontrol->private_value = (long)c;
>@@ -1057,14 +1321,16 @@ struct hda_ctl_ops snd_hda_bind_sw = {
>  * SPDIF out controls
>  */
> 
>-static int snd_hda_spdif_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *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;
> 	uinfo->count = 1;
> 	return 0;
> }
> 
>-static int snd_hda_spdif_cmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *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 |
> 					   IEC958_AES0_NONAUDIO |
>@@ -1075,7 +1341,8 @@ static int snd_hda_spdif_cmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl
> 	return 0;
> }
> 
>-static int snd_hda_spdif_pmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *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 |
> 					   IEC958_AES0_NONAUDIO |
>@@ -1083,7 +1350,8 @@ static int snd_hda_spdif_pmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl
> 	return 0;
> }
> 
>-static int snd_hda_spdif_default_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *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);
> 
>@@ -1103,19 +1371,21 @@ static unsigned short convert_from_spdif_status(unsigned int sbits)
> 	unsigned short val = 0;
> 
> 	if (sbits & IEC958_AES0_PROFESSIONAL)
>-		val |= 1 << 6;
>+		val |= AC_DIG1_PROFESSIONAL;
> 	if (sbits & IEC958_AES0_NONAUDIO)
>-		val |= 1 << 5;
>+		val |= AC_DIG1_NONAUDIO;
> 	if (sbits & IEC958_AES0_PROFESSIONAL) {
>-		if ((sbits & IEC958_AES0_PRO_EMPHASIS) == IEC958_AES0_PRO_EMPHASIS_5015)
>-			val |= 1 << 3;
>+		if ((sbits & IEC958_AES0_PRO_EMPHASIS) ==
>+		    IEC958_AES0_PRO_EMPHASIS_5015)
>+			val |= AC_DIG1_EMPHASIS;
> 	} 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_AES0_CON_EMPHASIS) ==
>+		    IEC958_AES0_CON_EMPHASIS_5015)
>+			val |= AC_DIG1_EMPHASIS;
>+		if (!(sbits & IEC958_AES0_CON_NOT_COPYRIGHT))
>+			val |= AC_DIG1_COPYRIGHT;
> 		if (sbits & (IEC958_AES1_CON_ORIGINAL << 8))
>-			val |= 1 << 7;
>+			val |= AC_DIG1_LEVEL;
> 		val |= sbits & (IEC958_AES1_CON_CATEGORY << 8);
> 	}
> 	return val;
>@@ -1127,26 +1397,27 @@ static unsigned int convert_to_spdif_status(unsigned short val)
> {
> 	unsigned int sbits = 0;
> 
>-	if (val & (1 << 5))
>+	if (val & AC_DIG1_NONAUDIO)
> 		sbits |= IEC958_AES0_NONAUDIO;
>-	if (val & (1 << 6))
>+	if (val & AC_DIG1_PROFESSIONAL)
> 		sbits |= IEC958_AES0_PROFESSIONAL;
> 	if (sbits & IEC958_AES0_PROFESSIONAL) {
>-		if (sbits & (1 << 3))
>+		if (sbits & AC_DIG1_EMPHASIS)
> 			sbits |= IEC958_AES0_PRO_EMPHASIS_5015;
> 	} else {
>-		if (val & (1 << 3))
>+		if (val & AC_DIG1_EMPHASIS)
> 			sbits |= IEC958_AES0_CON_EMPHASIS_5015;
>-		if (! (val & (1 << 4)))
>+		if (!(val & AC_DIG1_COPYRIGHT))
> 			sbits |= IEC958_AES0_CON_NOT_COPYRIGHT;
>-		if (val & (1 << 7))
>+		if (val & AC_DIG1_LEVEL)
> 			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)
>+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;
>@@ -1163,33 +1434,32 @@ static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_c
> 	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);
>+	if (change) {
>+		snd_hda_codec_write_cache(codec, nid, 0,
>+					  AC_VERB_SET_DIGI_CONVERT_1,
>+					  val & 0xff);
>+		snd_hda_codec_write_cache(codec, nid, 0,
>+					  AC_VERB_SET_DIGI_CONVERT_2,
>+					  val >> 8);
> 	}
> 
> 	mutex_unlock(&codec->spdif_mutex);
> 	return change;
> }
> 
>-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;
>-}
>+#define snd_hda_spdif_out_switch_info	snd_ctl_boolean_mono_info
> 
>-static int snd_hda_spdif_out_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
>+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;
>+	ucontrol->value.integer.value[0] = codec->spdif_ctls & AC_DIG1_ENABLE;
> 	return 0;
> }
> 
>-static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
>+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;
>@@ -1197,16 +1467,20 @@ static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol, struct sn
> 	int change;
> 
> 	mutex_lock(&codec->spdif_mutex);
>-	val = codec->spdif_ctls & ~1;
>+	val = codec->spdif_ctls & ~AC_DIG1_ENABLE;
> 	if (ucontrol->value.integer.value[0])
>-		val |= 1;
>+		val |= AC_DIG1_ENABLE;
> 	change = codec->spdif_ctls != val;
>-	if (change || codec->in_resume) {
>+	if (change) {
> 		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));
>+		snd_hda_codec_write_cache(codec, nid, 0,
>+					  AC_VERB_SET_DIGI_CONVERT_1,
>+					  val & 0xff);
>+		/* unmute amp switch (if any) */
>+		if ((get_wcaps(codec, nid) & AC_WCAP_OUT_AMP) &&
>+		    (val & AC_DIG1_ENABLE))
>+			snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
>+						 HDA_AMP_MUTE, 0);
> 	}
> 	mutex_unlock(&codec->spdif_mutex);
> 	return change;
>@@ -1244,6 +1518,8 @@ static struct snd_kcontrol_new dig_mixes[] = {
> 	{ } /* end */
> };
> 
>+#define SPDIF_MAX_IDX	4	/* 4 instances should be enough to probe */
>+
> /**
>  * snd_hda_create_spdif_out_ctls - create Output SPDIF-related controls
>  * @codec: the HDA codec
>@@ -1259,25 +1535,77 @@ int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid)
> 	int err;
> 	struct snd_kcontrol *kctl;
> 	struct snd_kcontrol_new *dig_mix;
>+	int idx;
> 
>+	for (idx = 0; idx < SPDIF_MAX_IDX; idx++) {
>+		if (!_snd_hda_find_mixer_ctl(codec, "IEC958 Playback Switch",
>+					     idx))
>+			break;
>+	}
>+	if (idx >= SPDIF_MAX_IDX) {
>+		printk(KERN_ERR "hda_codec: too many IEC958 outputs\n");
>+		return -EBUSY;
>+	}
> 	for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) {
> 		kctl = snd_ctl_new1(dig_mix, codec);
>+		kctl->id.index = idx;
> 		kctl->private_value = nid;
>-		if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
>+		err = snd_ctl_add(codec->bus->card, kctl);
>+		if (err < 0)
> 			return err;
> 	}
>-	codec->spdif_ctls = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0);
>+	codec->spdif_ctls =
>+		snd_hda_codec_read(codec, nid, 0,
>+				   AC_VERB_GET_DIGI_CONVERT_1, 0);
> 	codec->spdif_status = convert_to_spdif_status(codec->spdif_ctls);
> 	return 0;
> }
> 
> /*
>+ * SPDIF sharing with analog output
>+ */
>+static int spdif_share_sw_get(struct snd_kcontrol *kcontrol,
>+			      struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct hda_multi_out *mout = snd_kcontrol_chip(kcontrol);
>+	ucontrol->value.integer.value[0] = mout->share_spdif;
>+	return 0;
>+}
>+
>+static int spdif_share_sw_put(struct snd_kcontrol *kcontrol,
>+			      struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct hda_multi_out *mout = snd_kcontrol_chip(kcontrol);
>+	mout->share_spdif = !!ucontrol->value.integer.value[0];
>+	return 0;
>+}
>+
>+static struct snd_kcontrol_new spdif_share_sw = {
>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+	.name = "IEC958 Default PCM Playback Switch",
>+	.info = snd_ctl_boolean_mono_info,
>+	.get = spdif_share_sw_get,
>+	.put = spdif_share_sw_put,
>+};
>+
>+int snd_hda_create_spdif_share_sw(struct hda_codec *codec,
>+				  struct hda_multi_out *mout)
>+{
>+	if (!mout->dig_out_nid)
>+		return 0;
>+	/* ATTENTION: here mout is passed as private_data, instead of codec */
>+	return snd_ctl_add(codec->bus->card,
>+			   snd_ctl_new1(&spdif_share_sw, mout));
>+}
>+
>+/*
>  * SPDIF input
>  */
> 
> #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)
>+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);
> 
>@@ -1285,7 +1613,8 @@ static int snd_hda_spdif_in_switch_get(struct snd_kcontrol *kcontrol, struct snd
> 	return 0;
> }
> 
>-static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
>+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;
>@@ -1294,22 +1623,24 @@ static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol, struct snd
> 
> 	mutex_lock(&codec->spdif_mutex);
> 	change = codec->spdif_in_enable != val;
>-	if (change || codec->in_resume) {
>+	if (change) {
> 		codec->spdif_in_enable = val;
>-		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val);
>+		snd_hda_codec_write_cache(codec, nid, 0,
>+					  AC_VERB_SET_DIGI_CONVERT_1, val);
> 	}
> 	mutex_unlock(&codec->spdif_mutex);
> 	return change;
> }
> 
>-static int snd_hda_spdif_in_status_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
>+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);
>+	val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT_1, 0);
> 	sbits = convert_to_spdif_status(val);
> 	ucontrol->value.iec958.status[0] = sbits;
> 	ucontrol->value.iec958.status[1] = sbits >> 8;
>@@ -1351,17 +1682,104 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
> 	int err;
> 	struct snd_kcontrol *kctl;
> 	struct snd_kcontrol_new *dig_mix;
>+	int idx;
> 
>+	for (idx = 0; idx < SPDIF_MAX_IDX; idx++) {
>+		if (!_snd_hda_find_mixer_ctl(codec, "IEC958 Capture Switch",
>+					     idx))
>+			break;
>+	}
>+	if (idx >= SPDIF_MAX_IDX) {
>+		printk(KERN_ERR "hda_codec: too many IEC958 inputs\n");
>+		return -EBUSY;
>+	}
> 	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)
>+		err = snd_ctl_add(codec->bus->card, kctl);
>+		if (err < 0)
> 			return err;
> 	}
>-	codec->spdif_in_enable = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0) & 1;
>+	codec->spdif_in_enable =
>+		snd_hda_codec_read(codec, nid, 0,
>+				   AC_VERB_GET_DIGI_CONVERT_1, 0) &
>+		AC_DIG1_ENABLE;
> 	return 0;
> }
> 
>+#ifdef SND_HDA_NEEDS_RESUME
>+/*
>+ * command cache
>+ */
>+
>+/* build a 32bit cache key with the widget id and the command parameter */
>+#define build_cmd_cache_key(nid, verb)	((verb << 8) | nid)
>+#define get_cmd_cache_nid(key)		((key) & 0xff)
>+#define get_cmd_cache_cmd(key)		(((key) >> 8) & 0xffff)
>+
>+/**
>+ * snd_hda_codec_write_cache - send a single command with caching
>+ * @codec: the HDA codec
>+ * @nid: NID to send the command
>+ * @direct: direct flag
>+ * @verb: the verb to send
>+ * @parm: the parameter for the verb
>+ *
>+ * Send a single command without waiting for response.
>+ *
>+ * Returns 0 if successful, or a negative error code.
>+ */
>+int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid,
>+			      int direct, unsigned int verb, unsigned int parm)
>+{
>+	int err;
>+	snd_hda_power_up(codec);
>+	mutex_lock(&codec->bus->cmd_mutex);
>+	err = codec->bus->ops.command(codec, nid, direct, verb, parm);
>+	if (!err) {
>+		struct hda_cache_head *c;
>+		u32 key = build_cmd_cache_key(nid, verb);
>+		c = get_alloc_hash(&codec->cmd_cache, key);
>+		if (c)
>+			c->val = parm;
>+	}
>+	mutex_unlock(&codec->bus->cmd_mutex);
>+	snd_hda_power_down(codec);
>+	return err;
>+}
>+
>+/* resume the all commands from the cache */
>+void snd_hda_codec_resume_cache(struct hda_codec *codec)
>+{
>+	struct hda_cache_head *buffer = codec->cmd_cache.buffer;
>+	int i;
>+
>+	for (i = 0; i < codec->cmd_cache.size; i++, buffer++) {
>+		u32 key = buffer->key;
>+		if (!key)
>+			continue;
>+		snd_hda_codec_write(codec, get_cmd_cache_nid(key), 0,
>+				    get_cmd_cache_cmd(key), buffer->val);
>+	}
>+}
>+
>+/**
>+ * snd_hda_sequence_write_cache - sequence writes with caching
>+ * @codec: the HDA codec
>+ * @seq: VERB array to send
>+ *
>+ * Send the commands sequentially from the given array.
>+ * Thte commands are recorded on cache for power-save and resume.
>+ * The array must be terminated with NID=0.
>+ */
>+void snd_hda_sequence_write_cache(struct hda_codec *codec,
>+				  const struct hda_verb *seq)
>+{
>+	for (; seq->nid; seq++)
>+		snd_hda_codec_write_cache(codec, seq->nid, 0, seq->verb,
>+					  seq->param);
>+}
>+#endif /* SND_HDA_NEEDS_RESUME */
> 
> /*
>  * set power state of the codec
>@@ -1369,24 +1787,95 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
> 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;
>+	hda_nid_t nid;
>+	int i;
> 
> 	snd_hda_codec_write(codec, fg, 0, AC_VERB_SET_POWER_STATE,
> 			    power_state);
>+	msleep(10); /* partial workaround for "azx_get_response timeout" */
> 
>-	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)
>+	nid = codec->start_nid;
>+	for (i = 0; i < codec->num_nodes; i++, nid++) {
>+		unsigned int wcaps = get_wcaps(codec, nid);
>+		if (wcaps & AC_WCAP_POWER) {
>+			unsigned int wid_type = (wcaps & AC_WCAP_TYPE) >>
>+				AC_WCAP_TYPE_SHIFT;
>+			if (wid_type == AC_WID_PIN) {
>+				unsigned int pincap;
>+				/*
>+				 * don't power down the widget if it controls
>+				 * eapd and EAPD_BTLENABLE is set.
>+				 */
>+				pincap = snd_hda_param_read(codec, nid,
>+							    AC_PAR_PIN_CAP);
>+				if (pincap & AC_PINCAP_EAPD) {
>+					int eapd = snd_hda_codec_read(codec,
>+						nid, 0,
>+						AC_VERB_GET_EAPD_BTLENABLE, 0);
>+					eapd &= 0x02;
>+					if (power_state == AC_PWRST_D3 && eapd)
>+						continue;
>+				}
>+			}
> 			snd_hda_codec_write(codec, nid, 0,
> 					    AC_VERB_SET_POWER_STATE,
> 					    power_state);
>+		}
> 	}
> 
>-	if (power_state == AC_PWRST_D0)
>+	if (power_state == AC_PWRST_D0) {
>+		unsigned long end_time;
>+		int state;
> 		msleep(10);
>+		/* wait until the codec reachs to D0 */
>+		end_time = jiffies + msecs_to_jiffies(500);
>+		do {
>+			state = snd_hda_codec_read(codec, fg, 0,
>+						   AC_VERB_GET_POWER_STATE, 0);
>+			if (state == power_state)
>+				break;
>+			msleep(1);
>+		} while (time_after_eq(end_time, jiffies));
>+	}
> }
> 
>+#ifdef SND_HDA_NEEDS_RESUME
>+/*
>+ * call suspend and power-down; used both from PM and power-save
>+ */
>+static void hda_call_codec_suspend(struct hda_codec *codec)
>+{
>+	if (codec->patch_ops.suspend)
>+		codec->patch_ops.suspend(codec, PMSG_SUSPEND);
>+	hda_set_power_state(codec,
>+			    codec->afg ? codec->afg : codec->mfg,
>+			    AC_PWRST_D3);
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	cancel_delayed_work(&codec->power_work);
>+	codec->power_on = 0;
>+	codec->power_transition = 0;
>+#endif
>+}
>+
>+/*
>+ * kick up codec; used both from PM and power-save
>+ */
>+static void hda_call_codec_resume(struct hda_codec *codec)
>+{
>+	hda_set_power_state(codec,
>+			    codec->afg ? codec->afg : codec->mfg,
>+			    AC_PWRST_D0);
>+	if (codec->patch_ops.resume)
>+		codec->patch_ops.resume(codec);
>+	else {
>+		if (codec->patch_ops.init)
>+			codec->patch_ops.init(codec);
>+		snd_hda_codec_resume_amp(codec);
>+		snd_hda_codec_resume_cache(codec);
>+	}
>+}
>+#endif /* SND_HDA_NEEDS_RESUME */
>+
> 
> /**
>  * snd_hda_build_controls - build mixer controls
>@@ -1396,39 +1885,31 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
>  *
>  * Returns 0 if successful, otherwise a negative error code.
>  */
>-int snd_hda_build_controls(struct hda_bus *bus)
>+int __devinit snd_hda_build_controls(struct hda_bus *bus)
> {
>-	struct list_head *p;
>-
>-	/* build controls */
>-	list_for_each(p, &bus->codec_list) {
>-		struct hda_codec *codec = list_entry(p, struct hda_codec, list);
>-		int err;
>-		if (! codec->patch_ops.build_controls)
>-			continue;
>-		err = codec->patch_ops.build_controls(codec);
>-		if (err < 0)
>-			return err;
>-	}
>+	struct hda_codec *codec;
> 
>-	/* initialize */
>-	list_for_each(p, &bus->codec_list) {
>-		struct hda_codec *codec = list_entry(p, struct hda_codec, list);
>-		int err;
>+	list_for_each_entry(codec, &bus->codec_list, list) {
>+		int err = 0;
>+		/* fake as if already powered-on */
>+		hda_keep_power_on(codec);
>+		/* then fire up */
> 		hda_set_power_state(codec,
> 				    codec->afg ? codec->afg : codec->mfg,
> 				    AC_PWRST_D0);
>-		if (! codec->patch_ops.init)
>-			continue;
>-		err = codec->patch_ops.init(codec);
>+		/* continue to initialize... */
>+		if (codec->patch_ops.init)
>+			err = codec->patch_ops.init(codec);
>+		if (!err && codec->patch_ops.build_controls)
>+			err = codec->patch_ops.build_controls(codec);
>+		snd_hda_power_down(codec);
> 		if (err < 0)
> 			return err;
> 	}
>+
> 	return 0;
> }
> 
>-EXPORT_SYMBOL(snd_hda_build_controls);
>-
> /*
>  * stream formats
>  */
>@@ -1453,6 +1934,11 @@ static struct hda_rate_tbl rate_bits[] = {
> 	{ 96000, SNDRV_PCM_RATE_96000, 0x0800 }, /* 2 x 48 */
> 	{ 176400, SNDRV_PCM_RATE_176400, 0x5800 },/* 4 x 44 */
> 	{ 192000, SNDRV_PCM_RATE_192000, 0x1800 }, /* 4 x 48 */
>+#define AC_PAR_PCM_RATE_BITS	11
>+	/* up to bits 10, 384kHZ isn't supported properly */
>+
>+	/* not autodetected value */
>+	{ 9600, SNDRV_PCM_RATE_KNOT, 0x0400 }, /* 1/5 x 48 */
> 
> 	{ 0 } /* terminator */
> };
>@@ -1481,7 +1967,7 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate,
> 			val = rate_bits[i].hda_fmt;
> 			break;
> 		}
>-	if (! rate_bits[i].hz) {
>+	if (!rate_bits[i].hz) {
> 		snd_printdd("invalid rate %d\n", rate);
> 		return 0;
> 	}
>@@ -1506,15 +1992,14 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate,
> 			val |= 0x20;
> 		break;
> 	default:
>-		snd_printdd("invalid format width %d\n", snd_pcm_format_width(format));
>+		snd_printdd("invalid format width %d\n",
>+			    snd_pcm_format_width(format));
> 		return 0;
> 	}
> 
> 	return val;
> }
> 
>-EXPORT_SYMBOL(snd_hda_calc_stream_format);
>-
> /**
>  * snd_hda_query_supported_pcm - query the supported PCM rates and formats
>  * @codec: the HDA codec
>@@ -1541,12 +2026,12 @@ int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
> 		if (val == -1)
> 			return -EIO;
> 	}
>-	if (! val)
>+	if (!val)
> 		val = snd_hda_param_read(codec, codec->afg, AC_PAR_PCM);
> 
> 	if (ratesp) {
> 		u32 rates = 0;
>-		for (i = 0; rate_bits[i].hz; i++) {
>+		for (i = 0; i < AC_PAR_PCM_RATE_BITS; i++) {
> 			if (val & (1 << i))
> 				rates |= rate_bits[i].alsa_bits;
> 		}
>@@ -1562,8 +2047,9 @@ int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
> 		streams = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
> 		if (streams == -1)
> 			return -EIO;
>-		if (! streams) {
>-			streams = snd_hda_param_read(codec, codec->afg, AC_PAR_STREAM);
>+		if (!streams) {
>+			streams = snd_hda_param_read(codec, codec->afg,
>+						     AC_PAR_STREAM);
> 			if (streams == -1)
> 				return -EIO;
> 		}
>@@ -1587,7 +2073,8 @@ int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
> 					bps = 24;
> 				else if (val & AC_SUPPCM_BITS_20)
> 					bps = 20;
>-			} else if (val & (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24|AC_SUPPCM_BITS_32)) {
>+			} else if (val & (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24|
>+					  AC_SUPPCM_BITS_32)) {
> 				formats |= SNDRV_PCM_FMTBIT_S32_LE;
> 				if (val & AC_SUPPCM_BITS_32)
> 					bps = 32;
>@@ -1597,10 +2084,12 @@ int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
> 					bps = 20;
> 			}
> 		}
>-		else if (streams == AC_SUPFMT_FLOAT32) { /* should be exclusive */
>+		else if (streams == AC_SUPFMT_FLOAT32) {
>+			/* should be exclusive */
> 			formats |= SNDRV_PCM_FMTBIT_FLOAT_LE;
> 			bps = 32;
>-		} else if (streams == AC_SUPFMT_AC3) { /* should be exclusive */
>+		} else if (streams == AC_SUPFMT_AC3) {
>+			/* should be exclusive */
> 			/* temporary hack: we have still no proper support
> 			 * for the direct AC3 stream...
> 			 */
>@@ -1617,7 +2106,8 @@ int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
> }
> 
> /**
>- * snd_hda_is_supported_format - check whether the given node supports the format val
>+ * snd_hda_is_supported_format - check whether the given node supports
>+ * the format val
>  *
>  * Returns 1 if supported, 0 if not.
>  */
>@@ -1633,50 +2123,50 @@ int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,
> 		if (val == -1)
> 			return 0;
> 	}
>-	if (! val) {
>+	if (!val) {
> 		val = snd_hda_param_read(codec, codec->afg, AC_PAR_PCM);
> 		if (val == -1)
> 			return 0;
> 	}
> 
> 	rate = format & 0xff00;
>-	for (i = 0; rate_bits[i].hz; i++)
>+	for (i = 0; i < AC_PAR_PCM_RATE_BITS; i++)
> 		if (rate_bits[i].hda_fmt == rate) {
> 			if (val & (1 << i))
> 				break;
> 			return 0;
> 		}
>-	if (! rate_bits[i].hz)
>+	if (i >= AC_PAR_PCM_RATE_BITS)
> 		return 0;
> 
> 	stream = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
> 	if (stream == -1)
> 		return 0;
>-	if (! stream && nid != codec->afg)
>+	if (!stream && nid != codec->afg)
> 		stream = snd_hda_param_read(codec, codec->afg, AC_PAR_STREAM);
>-	if (! stream || stream == -1)
>+	if (!stream || stream == -1)
> 		return 0;
> 
> 	if (stream & AC_SUPFMT_PCM) {
> 		switch (format & 0xf0) {
> 		case 0x00:
>-			if (! (val & AC_SUPPCM_BITS_8))
>+			if (!(val & AC_SUPPCM_BITS_8))
> 				return 0;
> 			break;
> 		case 0x10:
>-			if (! (val & AC_SUPPCM_BITS_16))
>+			if (!(val & AC_SUPPCM_BITS_16))
> 				return 0;
> 			break;
> 		case 0x20:
>-			if (! (val & AC_SUPPCM_BITS_20))
>+			if (!(val & AC_SUPPCM_BITS_20))
> 				return 0;
> 			break;
> 		case 0x30:
>-			if (! (val & AC_SUPPCM_BITS_24))
>+			if (!(val & AC_SUPPCM_BITS_24))
> 				return 0;
> 			break;
> 		case 0x40:
>-			if (! (val & AC_SUPPCM_BITS_32))
>+			if (!(val & AC_SUPPCM_BITS_32))
> 				return 0;
> 			break;
> 		default:
>@@ -1713,19 +2203,19 @@ static int hda_pcm_default_cleanup(struct hda_pcm_stream *hinfo,
> 				   struct hda_codec *codec,
> 				   struct snd_pcm_substream *substream)
> {
>-	snd_hda_codec_setup_stream(codec, hinfo->nid, 0, 0, 0);
>+	snd_hda_codec_cleanup_stream(codec, hinfo->nid);
> 	return 0;
> }
> 
>-static int set_pcm_default_values(struct hda_codec *codec, struct hda_pcm_stream *info)
>+static int __devinit set_pcm_default_values(struct hda_codec *codec,
>+					    struct hda_pcm_stream *info)
> {
>-	if (info->nid) {
>-		/* query support PCM information from the given NID */
>-		if (! info->rates || ! info->formats)
>-			snd_hda_query_supported_pcm(codec, info->nid,
>-						    info->rates ? NULL : &info->rates,
>-						    info->formats ? NULL : &info->formats,
>-						    info->maxbps ? NULL : &info->maxbps);
>+	/* query support PCM information from the given NID */
>+	if (info->nid && (!info->rates || !info->formats)) {
>+		snd_hda_query_supported_pcm(codec, info->nid,
>+				info->rates ? NULL : &info->rates,
>+				info->formats ? NULL : &info->formats,
>+				info->maxbps ? NULL : &info->maxbps);
> 	}
> 	if (info->ops.open == NULL)
> 		info->ops.open = hda_pcm_default_open_close;
>@@ -1768,15 +2258,14 @@ static int set_pcm_default_values(struct hda_codec *codec, struct hda_pcm_stream
>  *
>  * This function returns 0 if successfull, or a negative error code.
>  */
>-int snd_hda_build_pcms(struct hda_bus *bus)
>+int __devinit snd_hda_build_pcms(struct hda_bus *bus)
> {
>-	struct list_head *p;
>+	struct hda_codec *codec;
> 
>-	list_for_each(p, &bus->codec_list) {
>-		struct hda_codec *codec = list_entry(p, struct hda_codec, list);
>+	list_for_each_entry(codec, &bus->codec_list, list) {
> 		unsigned int pcm, s;
> 		int err;
>-		if (! codec->patch_ops.build_pcms)
>+		if (!codec->patch_ops.build_pcms)
> 			continue;
> 		err = codec->patch_ops.build_pcms(codec);
> 		if (err < 0)
>@@ -1785,7 +2274,7 @@ int snd_hda_build_pcms(struct hda_bus *bus)
> 			for (s = 0; s < 2; s++) {
> 				struct hda_pcm_stream *info;
> 				info = &codec->pcm_info[pcm].stream[s];
>-				if (! info->substreams)
>+				if (!info->substreams)
> 					continue;
> 				err = set_pcm_default_values(codec, info);
> 				if (err < 0)
>@@ -1796,8 +2285,6 @@ int snd_hda_build_pcms(struct hda_bus *bus)
> 	return 0;
> }
> 
>-EXPORT_SYMBOL(snd_hda_build_pcms);
>-
> /**
>  * snd_hda_check_board_config - compare the current codec with the config table
>  * @codec: the HDA codec
>@@ -1834,7 +2321,7 @@ int snd_hda_check_board_config(struct hda_codec *codec,
> 	if (!tbl)
> 		return -1;
> 	if (tbl->value >= 0 && tbl->value < num_configs) {
>-#ifdef CONFIG_SND_DEBUG_DETECT
>+#ifdef CONFIG_SND_DEBUG_VERBOSE
> 		char tmp[10];
> 		const char *model = NULL;
> 		if (models)
>@@ -1865,34 +2352,123 @@ int snd_hda_check_board_config(struct hda_codec *codec,
>  */
> int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)
> {
>-	int err;
>+ 	int err;
> 
> 	for (; knew->name; knew++) {
> 		struct snd_kcontrol *kctl;
> 		kctl = snd_ctl_new1(knew, codec);
>-		if (! kctl)
>+		if (!kctl)
> 			return -ENOMEM;
> 		err = snd_ctl_add(codec->bus->card, kctl);
> 		if (err < 0) {
>-			if (! codec->addr)
>+			if (!codec->addr)
> 				return err;
> 			kctl = snd_ctl_new1(knew, codec);
>-			if (! kctl)
>+			if (!kctl)
> 				return -ENOMEM;
> 			kctl->id.device = codec->addr;
>-			if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
>+			err = snd_ctl_add(codec->bus->card, kctl);
>+			if (err < 0)
> 				return err;
> 		}
> 	}
> 	return 0;
> }
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
>+				unsigned int power_state);
>+
>+static void hda_power_work(void *data)
>+{
>+	struct hda_codec *codec = data;
>+
>+	if (!codec->power_on || codec->power_count) {
>+		codec->power_transition = 0;
>+		return;
>+	}
>+
>+	hda_call_codec_suspend(codec);
>+	if (codec->bus->ops.pm_notify)
>+		codec->bus->ops.pm_notify(codec);
>+}
>+
>+static void hda_keep_power_on(struct hda_codec *codec)
>+{
>+	codec->power_count++;
>+	codec->power_on = 1;
>+}
>+
>+void snd_hda_power_up(struct hda_codec *codec)
>+{
>+	codec->power_count++;
>+	if (codec->power_on || codec->power_transition)
>+		return;
>+
>+	codec->power_on = 1;
>+	if (codec->bus->ops.pm_notify)
>+		codec->bus->ops.pm_notify(codec);
>+	hda_call_codec_resume(codec);
>+	cancel_delayed_work(&codec->power_work);
>+	codec->power_transition = 0;
>+}
>+
>+void snd_hda_power_down(struct hda_codec *codec)
>+{
>+	--codec->power_count;
>+	if (!codec->power_on || codec->power_count || codec->power_transition)
>+		return;
>+	if (power_save) {
>+		codec->power_transition = 1; /* avoid reentrance */
>+		schedule_delayed_work(&codec->power_work,
>+				      msecs_to_jiffies(power_save * 1000));
>+	}
>+}
>+
>+int snd_hda_check_amp_list_power(struct hda_codec *codec,
>+				 struct hda_loopback_check *check,
>+				 hda_nid_t nid)
>+{
>+	struct hda_amp_list *p;
>+	int ch, v;
>+
>+	if (!check->amplist)
>+		return 0;
>+	for (p = check->amplist; p->nid; p++) {
>+		if (p->nid == nid)
>+			break;
>+	}
>+	if (!p->nid)
>+		return 0; /* nothing changed */
>+
>+	for (p = check->amplist; p->nid; p++) {
>+		for (ch = 0; ch < 2; ch++) {
>+			v = snd_hda_codec_amp_read(codec, p->nid, ch, p->dir,
>+						   p->idx);
>+			if (!(v & HDA_AMP_MUTE) && v > 0) {
>+				if (!check->power_on) {
>+					check->power_on = 1;
>+					snd_hda_power_up(codec);
>+				}
>+				return 1;
>+			}
>+		}
>+	}
>+	if (check->power_on) {
>+		check->power_on = 0;
>+		snd_hda_power_down(codec);
>+	}
>+	return 0;
>+}
>+#endif
> 
> /*
>  * 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)
>+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;
>@@ -1904,8 +2480,10 @@ int snd_hda_ch_mode_info(struct hda_codec *codec, struct snd_ctl_elem_info *uinf
> 	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 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;
>@@ -1919,33 +2497,39 @@ int snd_hda_ch_mode_get(struct hda_codec *codec, struct snd_ctl_elem_value *ucon
> 	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 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)
>+	if (mode >= num_chmodes)
>+		return -EINVAL;
>+	if (*max_channelsp == chmode[mode].channels)
> 		return 0;
> 	/* change the current channel setting */
> 	*max_channelsp = chmode[mode].channels;
> 	if (chmode[mode].sequence)
>-		snd_hda_sequence_write(codec, chmode[mode].sequence);
>+		snd_hda_sequence_write_cache(codec, chmode[mode].sequence);
> 	return 1;
> }
> 
> /*
>  * input MUX helper
>  */
>-int snd_hda_input_mux_info(const struct hda_input_mux *imux, struct snd_ctl_elem_info *uinfo)
>+int snd_hda_input_mux_info(const struct hda_input_mux *imux,
>+			   struct snd_ctl_elem_info *uinfo)
> {
> 	unsigned int index;
> 
> 	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
> 	uinfo->count = 1;
> 	uinfo->value.enumerated.items = imux->num_items;
>+	if (!imux->num_items)
>+		return 0;
> 	index = uinfo->value.enumerated.item;
> 	if (index >= imux->num_items)
> 		index = imux->num_items - 1;
>@@ -1953,19 +2537,23 @@ int snd_hda_input_mux_info(const struct hda_input_mux *imux, struct snd_ctl_elem
> 	return 0;
> }
> 
>-int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *imux,
>-			  struct snd_ctl_elem_value *ucontrol, hda_nid_t nid,
>+int snd_hda_input_mux_put(struct hda_codec *codec,
>+			  const struct hda_input_mux *imux,
>+			  struct snd_ctl_elem_value *ucontrol,
>+			  hda_nid_t nid,
> 			  unsigned int *cur_val)
> {
> 	unsigned int idx;
> 
>+	if (!imux->num_items)
>+		return 0;
> 	idx = ucontrol->value.enumerated.item[0];
> 	if (idx >= imux->num_items)
> 		idx = imux->num_items - 1;
>-	if (*cur_val == idx && ! codec->in_resume)
>+	if (*cur_val == idx)
> 		return 0;
>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,
>-			    imux->items[idx].index);
>+	snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,
>+				  imux->items[idx].index);
> 	*cur_val = idx;
> 	return 1;
> }
>@@ -1975,25 +2563,53 @@ int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *i
>  * Multi-channel / digital-out PCM helper functions
>  */
> 
>+/* setup SPDIF output stream */
>+static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid,
>+				 unsigned int stream_tag, unsigned int format)
>+{
>+	/* turn off SPDIF once; otherwise the IEC958 bits won't be updated */
>+	if (codec->spdif_ctls & AC_DIG1_ENABLE)
>+		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
>+				    codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff);
>+	snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format);
>+	/* turn on again (if needed) */
>+	if (codec->spdif_ctls & AC_DIG1_ENABLE)
>+		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
>+				    codec->spdif_ctls & 0xff);
>+}
>+
> /*
>  * open the digital out in the exclusive mode
>  */
>-int snd_hda_multi_out_dig_open(struct hda_codec *codec, struct hda_multi_out *mout)
>+int snd_hda_multi_out_dig_open(struct hda_codec *codec,
>+			       struct hda_multi_out *mout)
> {
> 	mutex_lock(&codec->spdif_mutex);
>-	if (mout->dig_out_used) {
>-		mutex_unlock(&codec->spdif_mutex);
>-		return -EBUSY; /* already being used */
>-	}
>+	if (mout->dig_out_used == HDA_DIG_ANALOG_DUP)
>+		/* already opened as analog dup; reset it once */
>+		snd_hda_codec_cleanup_stream(codec, mout->dig_out_nid);
> 	mout->dig_out_used = HDA_DIG_EXCLUSIVE;
> 	mutex_unlock(&codec->spdif_mutex);
> 	return 0;
> }
> 
>+int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
>+				  struct hda_multi_out *mout,
>+				  unsigned int stream_tag,
>+				  unsigned int format,
>+				  struct snd_pcm_substream *substream)
>+{
>+	mutex_lock(&codec->spdif_mutex);
>+	setup_dig_out_stream(codec, mout->dig_out_nid, stream_tag, format);
>+	mutex_unlock(&codec->spdif_mutex);
>+	return 0;
>+}
>+
> /*
>  * release the digital out
>  */
>-int snd_hda_multi_out_dig_close(struct hda_codec *codec, struct hda_multi_out *mout)
>+int snd_hda_multi_out_dig_close(struct hda_codec *codec,
>+				struct hda_multi_out *mout)
> {
> 	mutex_lock(&codec->spdif_mutex);
> 	mout->dig_out_used = 0;
>@@ -2004,10 +2620,38 @@ int snd_hda_multi_out_dig_close(struct hda_codec *codec, struct hda_multi_out *m
> /*
>  * set up more restrictions for analog out
>  */
>-int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out *mout,
>-				  struct snd_pcm_substream *substream)
>-{
>-	substream->runtime->hw.channels_max = mout->max_channels;
>+int snd_hda_multi_out_analog_open(struct hda_codec *codec,
>+				  struct hda_multi_out *mout,
>+				  struct snd_pcm_substream *substream,
>+				  struct hda_pcm_stream *hinfo)
>+{
>+	struct snd_pcm_runtime *runtime = substream->runtime;
>+	runtime->hw.channels_max = mout->max_channels;
>+	if (mout->dig_out_nid) {
>+		if (!mout->analog_rates) {
>+			mout->analog_rates = hinfo->rates;
>+			mout->analog_formats = hinfo->formats;
>+			mout->analog_maxbps = hinfo->maxbps;
>+		} else {
>+			runtime->hw.rates = mout->analog_rates;
>+			runtime->hw.formats = mout->analog_formats;
>+			hinfo->maxbps = mout->analog_maxbps;
>+		}
>+		if (!mout->spdif_rates) {
>+			snd_hda_query_supported_pcm(codec, mout->dig_out_nid,
>+						    &mout->spdif_rates,
>+						    &mout->spdif_formats,
>+						    &mout->spdif_maxbps);
>+		}
>+		mutex_lock(&codec->spdif_mutex);
>+		if (mout->share_spdif) {
>+			runtime->hw.rates &= mout->spdif_rates;
>+			runtime->hw.formats &= mout->spdif_formats;
>+			if (mout->spdif_maxbps < hinfo->maxbps)
>+				hinfo->maxbps = mout->spdif_maxbps;
>+		}
>+		mutex_unlock(&codec->spdif_mutex);
>+	}
> 	return snd_pcm_hw_constraint_step(substream->runtime, 0,
> 					  SNDRV_PCM_HW_PARAM_CHANNELS, 2);
> }
>@@ -2016,7 +2660,8 @@ int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out
>  * set up the i/o for analog out
>  * when the digital out is available, copy the front out to digital out, too.
>  */
>-int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_out *mout,
>+int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
>+				     struct hda_multi_out *mout,
> 				     unsigned int stream_tag,
> 				     unsigned int format,
> 				     struct snd_pcm_substream *substream)
>@@ -2026,29 +2671,33 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_o
> 	int i;
> 
> 	mutex_lock(&codec->spdif_mutex);
>-	if (mout->dig_out_nid && mout->dig_out_used != HDA_DIG_EXCLUSIVE) {
>+	if (mout->dig_out_nid && mout->share_spdif &&
>+	    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)) {
>+		    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);
>+			setup_dig_out_stream(codec, mout->dig_out_nid,
>+					     stream_tag, format);
> 		} else {
> 			mout->dig_out_used = 0;
>-			snd_hda_codec_setup_stream(codec, mout->dig_out_nid, 0, 0, 0);
>+			snd_hda_codec_cleanup_stream(codec, mout->dig_out_nid);
> 		}
> 	}
> 	mutex_unlock(&codec->spdif_mutex);
> 
> 	/* front */
>-	snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag, 0, format);
>-	if (mout->hp_nid && mout->hp_nid != nids[HDA_FRONT])
>+	snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag,
>+				   0, format);
>+	if (!mout->no_share_stream &&
>+	    mout->hp_nid && mout->hp_nid != nids[HDA_FRONT])
> 		/* headphone out will just decode front left/right (stereo) */
>-		snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag, 0, format);
>+		snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag,
>+					   0, format);
> 	/* extra outputs copied from front */
> 	for (i = 0; i < ARRAY_SIZE(mout->extra_out_nid); i++)
>-		if (mout->extra_out_nid[i])
>+		if (!mout->no_share_stream && mout->extra_out_nid[i])
> 			snd_hda_codec_setup_stream(codec,
> 						   mout->extra_out_nid[i],
> 						   stream_tag, 0, format);
>@@ -2056,11 +2705,11 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_o
> 	/* surrounds */
> 	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);
>+			snd_hda_codec_setup_stream(codec, nids[i], stream_tag,
>+						   i * 2, format);
>+		else if (!mout->no_share_stream) /* copy front */
>+			snd_hda_codec_setup_stream(codec, nids[i], stream_tag,
>+						   0, format);
> 	}
> 	return 0;
> }
>@@ -2068,23 +2717,23 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_o
> /*
>  * clean up the setting for analog out
>  */
>-int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, struct hda_multi_out *mout)
>+int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
>+				     struct hda_multi_out *mout)
> {
> 	hda_nid_t *nids = mout->dac_nids;
> 	int i;
> 
> 	for (i = 0; i < mout->num_dacs; i++)
>-		snd_hda_codec_setup_stream(codec, nids[i], 0, 0, 0);
>+		snd_hda_codec_cleanup_stream(codec, nids[i]);
> 	if (mout->hp_nid)
>-		snd_hda_codec_setup_stream(codec, mout->hp_nid, 0, 0, 0);
>+		snd_hda_codec_cleanup_stream(codec, mout->hp_nid);
> 	for (i = 0; i < ARRAY_SIZE(mout->extra_out_nid); i++)
> 		if (mout->extra_out_nid[i])
>-			snd_hda_codec_setup_stream(codec,
>-						   mout->extra_out_nid[i],
>-						   0, 0, 0);
>+			snd_hda_codec_cleanup_stream(codec,
>+						     mout->extra_out_nid[i]);
> 	mutex_lock(&codec->spdif_mutex);
> 	if (mout->dig_out_nid && mout->dig_out_used == HDA_DIG_ANALOG_DUP) {
>-		snd_hda_codec_setup_stream(codec, mout->dig_out_nid, 0, 0, 0);
>+		snd_hda_codec_cleanup_stream(codec, mout->dig_out_nid);
> 		mout->dig_out_used = 0;
> 	}
> 	mutex_unlock(&codec->spdif_mutex);
>@@ -2103,6 +2752,32 @@ static int is_in_nid_list(hda_nid_t nid, hda_nid_t *list)
> 	return 0;
> }
> 
>+
>+/*
>+ * Sort an associated group of pins according to their sequence numbers.
>+ */
>+static void sort_pins_by_sequence(hda_nid_t * pins, short * sequences,
>+				  int num_pins)
>+{
>+	int i, j;
>+	short seq;
>+	hda_nid_t nid;
>+	
>+	for (i = 0; i < num_pins; i++) {
>+		for (j = i + 1; j < num_pins; j++) {
>+			if (sequences[i] > sequences[j]) {
>+				seq = sequences[i];
>+				sequences[i] = sequences[j];
>+				sequences[j] = seq;
>+				nid = pins[i];
>+				pins[i] = pins[j];
>+				pins[j] = nid;
>+			}
>+		}
>+	}
>+}
>+
>+
> /*
>  * Parse all pin widgets and store the useful pin nids to cfg
>  *
>@@ -2120,22 +2795,28 @@ static int is_in_nid_list(hda_nid_t nid, hda_nid_t *list)
>  * The digital input/output pins are assigned to dig_in_pin and dig_out_pin,
>  * respectively.
>  */
>-int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *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, assoc_line_out, sequences[ARRAY_SIZE(cfg->line_out_pins)];
>+	hda_nid_t nid, end_nid;
>+	short seq, assoc_line_out, assoc_speaker;
>+	short sequences_line_out[ARRAY_SIZE(cfg->line_out_pins)];
>+	short sequences_speaker[ARRAY_SIZE(cfg->speaker_pins)];
>+	short sequences_hp[ARRAY_SIZE(cfg->hp_pins)];
> 
> 	memset(cfg, 0, sizeof(*cfg));
> 
>-	memset(sequences, 0, sizeof(sequences));
>-	assoc_line_out = 0;
>+	memset(sequences_line_out, 0, sizeof(sequences_line_out));
>+	memset(sequences_speaker, 0, sizeof(sequences_speaker));
>+	memset(sequences_hp, 0, sizeof(sequences_hp));
>+	assoc_line_out = assoc_speaker = 0;
> 
>-	nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid_start);
>-	for (nid = nid_start; nid < nodes + nid_start; nid++) {
>+	end_nid = codec->start_nid + codec->num_nodes;
>+	for (nid = codec->start_nid; nid < end_nid; nid++) {
> 		unsigned int wid_caps = get_wcaps(codec, nid);
>-		unsigned int wid_type = (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
>+		unsigned int wid_type =
>+			(wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
> 		unsigned int def_conf;
> 		short assoc, loc;
> 
>@@ -2146,7 +2827,8 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *c
> 		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);
>+		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);
>@@ -2154,28 +2836,44 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *c
> 		case AC_JACK_LINE_OUT:
> 			seq = get_defcfg_sequence(def_conf);
> 			assoc = get_defcfg_association(def_conf);
>-			if (! assoc)
>+
>+			if (!(wid_caps & AC_WCAP_STEREO))
>+				if (!cfg->mono_out_pin)
>+					cfg->mono_out_pin = nid;
>+			if (!assoc)
> 				continue;
>-			if (! assoc_line_out)
>+			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;
>+			sequences_line_out[cfg->line_outs] = seq;
> 			cfg->line_outs++;
> 			break;
> 		case AC_JACK_SPEAKER:
>+			seq = get_defcfg_sequence(def_conf);
>+			assoc = get_defcfg_association(def_conf);
>+			if (! assoc)
>+				continue;
>+			if (! assoc_speaker)
>+				assoc_speaker = assoc;
>+			else if (assoc_speaker != assoc)
>+				continue;
> 			if (cfg->speaker_outs >= ARRAY_SIZE(cfg->speaker_pins))
> 				continue;
> 			cfg->speaker_pins[cfg->speaker_outs] = nid;
>+			sequences_speaker[cfg->speaker_outs] = seq;
> 			cfg->speaker_outs++;
> 			break;
> 		case AC_JACK_HP_OUT:
>+			seq = get_defcfg_sequence(def_conf);
>+			assoc = get_defcfg_association(def_conf);
> 			if (cfg->hp_outs >= ARRAY_SIZE(cfg->hp_pins))
> 				continue;
> 			cfg->hp_pins[cfg->hp_outs] = nid;
>+			sequences_hp[cfg->hp_outs] = (assoc << 4) | seq;
> 			cfg->hp_outs++;
> 			break;
> 		case AC_JACK_MIC_IN: {
>@@ -2214,35 +2912,87 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *c
> 		}
> 	}
> 
>-	/* 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;
>+	/* FIX-UP:
>+	 * If no line-out is defined but multiple HPs are found,
>+	 * some of them might be the real line-outs.
>+	 */
>+	if (!cfg->line_outs && cfg->hp_outs > 1) {
>+		int i = 0;
>+		while (i < cfg->hp_outs) {
>+			/* The real HPs should have the sequence 0x0f */
>+			if ((sequences_hp[i] & 0x0f) == 0x0f) {
>+				i++;
>+				continue;
> 			}
>+			/* Move it to the line-out table */
>+			cfg->line_out_pins[cfg->line_outs] = cfg->hp_pins[i];
>+			sequences_line_out[cfg->line_outs] = sequences_hp[i];
>+			cfg->line_outs++;
>+			cfg->hp_outs--;
>+			memmove(cfg->hp_pins + i, cfg->hp_pins + i + 1,
>+				sizeof(cfg->hp_pins[0]) * (cfg->hp_outs - i));
>+			memmove(sequences_hp + i - 1, sequences_hp + i,
>+				sizeof(sequences_hp[0]) * (cfg->hp_outs - i));
>+		}
>+	}
>+
>+	/* sort by sequence */
>+	sort_pins_by_sequence(cfg->line_out_pins, sequences_line_out,
>+			      cfg->line_outs);
>+	sort_pins_by_sequence(cfg->speaker_pins, sequences_speaker,
>+			      cfg->speaker_outs);
>+	sort_pins_by_sequence(cfg->hp_pins, sequences_hp,
>+			      cfg->hp_outs);
>+	
>+	/* if we have only one mic, make it AUTO_PIN_MIC */
>+	if (!cfg->input_pins[AUTO_PIN_MIC] &&
>+	    cfg->input_pins[AUTO_PIN_FRONT_MIC]) {
>+		cfg->input_pins[AUTO_PIN_MIC] =
>+			cfg->input_pins[AUTO_PIN_FRONT_MIC];
>+		cfg->input_pins[AUTO_PIN_FRONT_MIC] = 0;
>+	}
>+	/* ditto for line-in */
>+	if (!cfg->input_pins[AUTO_PIN_LINE] &&
>+	    cfg->input_pins[AUTO_PIN_FRONT_LINE]) {
>+		cfg->input_pins[AUTO_PIN_LINE] =
>+			cfg->input_pins[AUTO_PIN_FRONT_LINE];
>+		cfg->input_pins[AUTO_PIN_FRONT_LINE] = 0;
>+	}
>+
>+	/*
>+	 * FIX-UP: if no line-outs are detected, try to use speaker or HP pin
>+	 * as a primary output
>+	 */
>+	if (!cfg->line_outs) {
>+		if (cfg->speaker_outs) {
>+			cfg->line_outs = cfg->speaker_outs;
>+			memcpy(cfg->line_out_pins, cfg->speaker_pins,
>+			       sizeof(cfg->speaker_pins));
>+			cfg->speaker_outs = 0;
>+			memset(cfg->speaker_pins, 0, sizeof(cfg->speaker_pins));
>+			cfg->line_out_type = AUTO_PIN_SPEAKER_OUT;
>+		} else if (cfg->hp_outs) {
>+			cfg->line_outs = cfg->hp_outs;
>+			memcpy(cfg->line_out_pins, cfg->hp_pins,
>+			       sizeof(cfg->hp_pins));
>+			cfg->hp_outs = 0;
>+			memset(cfg->hp_pins, 0, sizeof(cfg->hp_pins));
>+			cfg->line_out_type = AUTO_PIN_HP_OUT;
>+		}
>+	}
> 
> 	/* 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
>+	 *    8-ch: front/clfe/rear/side|fc
> 	 */
> 	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[1] = cfg->line_out_pins[2];
> 		cfg->line_out_pins[2] = nid;
> 		break;
> 	}
>@@ -2262,6 +3012,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *c
> 		   cfg->hp_outs, cfg->hp_pins[0],
> 		   cfg->hp_pins[1], cfg->hp_pins[2],
> 		   cfg->hp_pins[3], cfg->hp_pins[4]);
>+	snd_printd("   mono: mono_out=0x%x\n", cfg->mono_out_pin);
> 	snd_printd("   inputs: mic=0x%x, fmic=0x%x, line=0x%x, fline=0x%x,"
> 		   " cd=0x%x, aux=0x%x\n",
> 		   cfg->input_pins[AUTO_PIN_MIC],
>@@ -2271,26 +3022,6 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *c
> 		   cfg->input_pins[AUTO_PIN_CD],
> 		   cfg->input_pins[AUTO_PIN_AUX]);
> 
>-	/*
>-	 * FIX-UP: if no line-outs are detected, try to use speaker or HP pin
>-	 * as a primary output
>-	 */
>-	if (! cfg->line_outs) {
>-		if (cfg->speaker_outs) {
>-			cfg->line_outs = cfg->speaker_outs;
>-			memcpy(cfg->line_out_pins, cfg->speaker_pins,
>-			       sizeof(cfg->speaker_pins));
>-			cfg->speaker_outs = 0;
>-			memset(cfg->speaker_pins, 0, sizeof(cfg->speaker_pins));
>-		} else if (cfg->hp_outs) {
>-			cfg->line_outs = cfg->hp_outs;
>-			memcpy(cfg->line_out_pins, cfg->hp_pins,
>-			       sizeof(cfg->hp_pins));
>-			cfg->hp_outs = 0;
>-			memset(cfg->hp_pins, 0, sizeof(cfg->hp_pins));
>-		}
>-	}
>-
> 	return 0;
> }
> 
>@@ -2314,117 +3045,48 @@ const char *auto_pin_cfg_labels[AUTO_PIN_LAST] = {
>  */
> int snd_hda_suspend(struct hda_bus *bus, pm_message_t state)
> {
>-	struct list_head *p;
>+	struct hda_codec *codec;
> 
>-	/* FIXME: should handle power widget capabilities */
>-	list_for_each(p, &bus->codec_list) {
>-		struct hda_codec *codec = list_entry(p, struct hda_codec, list);
>-		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);
>+	list_for_each_entry(codec, &bus->codec_list, list) {
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+		if (!codec->power_on)
>+			continue;
>+#endif
>+		hda_call_codec_suspend(codec);
> 	}
> 	return 0;
> }
> 
>-EXPORT_SYMBOL(snd_hda_suspend);
>-
> /**
>  * snd_hda_resume - resume the codecs
>  * @bus: the HDA bus
>  * @state: resume state
>  *
>  * Returns 0 if successful.
>+ *
>+ * This fucntion is defined only when POWER_SAVE isn't set.
>+ * In the power-save mode, the codec is resumed dynamically.
>  */
> int snd_hda_resume(struct hda_bus *bus)
> {
>-	struct list_head *p;
>+	struct hda_codec *codec;
> 
>-	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);
>+	list_for_each_entry(codec, &bus->codec_list, list) {
>+		if (snd_hda_codec_needs_resume(codec))
>+			hda_call_codec_resume(codec);
> 	}
> 	return 0;
> }
>-
>-EXPORT_SYMBOL(snd_hda_resume);
>-
>-/**
>- * snd_hda_resume_ctls - resume controls in the new control list
>- * @codec: the HDA codec
>- * @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, struct snd_kcontrol_new *knew)
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+int snd_hda_codecs_inuse(struct hda_bus *bus)
> {
>-	struct snd_ctl_elem_value *val;
>+	struct hda_codec *codec;
> 
>-	val = kmalloc(sizeof(*val), GFP_KERNEL);
>-	if (! val)
>-		return -ENOMEM;
>-	codec->in_resume = 1;
>-	for (; knew->name; knew++) {
>-		int i, count;
>-		count = knew->count ? knew->count : 1;
>-		for (i = 0; i < count; i++) {
>-			memset(val, 0, sizeof(*val));
>-			val->id.iface = knew->iface;
>-			val->id.device = knew->device;
>-			val->id.subdevice = knew->subdevice;
>-			strcpy(val->id.name, knew->name);
>-			val->id.index = knew->index ? knew->index : i;
>-			/* Assume that get callback reads only from cache,
>-			 * not accessing to the real hardware
>-			 */
>-			if (snd_ctl_elem_read(codec->bus->card, val) < 0)
>-				continue;
>-			snd_ctl_elem_write(codec->bus->card, NULL, val);
>-		}
>+	list_for_each_entry(codec, &bus->codec_list, list) {
>+		if (snd_hda_codec_needs_resume(codec))
>+			return 1;
> 	}
>-	codec->in_resume = 0;
>-	kfree(val);
> 	return 0;
> }
>-
>-/**
>- * snd_hda_resume_spdif_out - resume the digital out
>- * @codec: the HDA codec
>- */
>-int snd_hda_resume_spdif_out(struct hda_codec *codec)
>-{
>-	return snd_hda_resume_ctls(codec, dig_mixes);
>-}
>-
>-/**
>- * snd_hda_resume_spdif_in - resume the digital in
>- * @codec: the HDA codec
>- */
>-int snd_hda_resume_spdif_in(struct hda_codec *codec)
>-{
>-	return snd_hda_resume_ctls(codec, dig_in_ctls);
>-}
> #endif
>-
>-/*
>- *  INIT part
>- */
>-
>-static int __init alsa_hda_init(void)
>-{
>-	return 0;
>-}
>-
>-static void __exit alsa_hda_exit(void)
>-{
>-}
>-
>-module_init(alsa_hda_init)
>-module_exit(alsa_hda_exit)
>+#endif
>diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
>index c12bc4e..9f523fa 100644
>--- a/sound/pci/hda/hda_codec.h
>+++ b/sound/pci/hda/hda_codec.h
>@@ -24,6 +24,11 @@
> #include <sound/info.h>
> #include <sound/control.h>
> #include <sound/pcm.h>
>+#include <sound/hwdep.h>
>+
>+#if defined(CONFIG_PM) || defined(CONFIG_SND_HDA_POWER_SAVE)
>+#define SND_HDA_NEEDS_RESUME	/* resume control code is required */
>+#endif
> 
> /*
>  * nodes
>@@ -72,12 +77,16 @@ enum {
> #define AC_VERB_GET_PIN_SENSE			0x0f09
> #define AC_VERB_GET_BEEP_CONTROL		0x0f0a
> #define AC_VERB_GET_EAPD_BTLENABLE		0x0f0c
>-#define AC_VERB_GET_DIGI_CONVERT		0x0f0d
>+#define AC_VERB_GET_DIGI_CONVERT_1		0x0f0d
>+#define AC_VERB_GET_DIGI_CONVERT_2		0x0f0e
> #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_GPIO_WAKE_MASK		0x0f18
>+#define AC_VERB_GET_GPIO_UNSOLICITED_RSP_MASK	0x0f19
>+#define AC_VERB_GET_GPIO_STICKY_MASK		0x0f1a
> #define AC_VERB_GET_CONFIG_DEFAULT		0x0f1c
> /* f20: AFG/MFG */
> #define AC_VERB_GET_SUBSYSTEM_ID		0x0f20
>@@ -105,6 +114,9 @@ enum {
> #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_GPIO_WAKE_MASK		0x718
>+#define AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK	0x719
>+#define AC_VERB_SET_GPIO_STICKY_MASK		0x71a
> #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_0	0x71c
> #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_1	0x71d
> #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_2	0x71e
>@@ -130,6 +142,7 @@ enum {
> #define AC_PAR_PROC_CAP			0x10
> #define AC_PAR_GPIO_CAP			0x11
> #define AC_PAR_AMP_OUT_CAP		0x12
>+#define AC_PAR_VOL_KNB_CAP		0x13
> 
> /*
>  * AC_VERB_PARAMETERS results (32bit)
>@@ -176,6 +189,27 @@ enum {
> #define AC_SUPFMT_FLOAT32		(1<<1)
> #define AC_SUPFMT_AC3			(1<<2)
> 
>+/* GP I/O count */
>+#define AC_GPIO_IO_COUNT		(0xff<<0)
>+#define AC_GPIO_O_COUNT			(0xff<<8)
>+#define AC_GPIO_O_COUNT_SHIFT		8
>+#define AC_GPIO_I_COUNT			(0xff<<16)
>+#define AC_GPIO_I_COUNT_SHIFT		16
>+#define AC_GPIO_UNSOLICITED		(1<<30)
>+#define AC_GPIO_WAKE			(1<<31)
>+
>+/* Converter stream, channel */
>+#define AC_CONV_CHANNEL			(0xf<<0)
>+#define AC_CONV_STREAM			(0xf<<4)
>+#define AC_CONV_STREAM_SHIFT		4
>+
>+/* Input converter SDI select */
>+#define AC_SDI_SELECT			(0xf<<0)
>+
>+/* Unsolicited response */
>+#define AC_UNSOL_TAG			(0x3f<<0)
>+#define AC_UNSOL_ENABLED		(1<<7)
>+
> /* Pin widget capabilies */
> #define AC_PINCAP_IMP_SENSE		(1<<0)	/* impedance sense capable */
> #define AC_PINCAP_TRIG_REQ		(1<<1)	/* trigger required */
>@@ -184,6 +218,10 @@ enum {
> #define AC_PINCAP_OUT			(1<<4)	/* output capable */
> #define AC_PINCAP_IN			(1<<5)	/* input capable */
> #define AC_PINCAP_BALANCE		(1<<6)	/* balanced I/O capable */
>+/* Note: This LR_SWAP pincap is defined in the Realtek ALC883 specification,
>+ *       but is marked reserved in the Intel HDA specification.
>+ */
>+#define AC_PINCAP_LR_SWAP		(1<<7)	/* L/R swap */
> #define AC_PINCAP_VREF			(0x37<<8)
> #define AC_PINCAP_VREF_SHIFT		8
> #define AC_PINCAP_EAPD			(1<<16)	/* EAPD capable */
>@@ -199,7 +237,9 @@ enum {
> #define AC_AMPCAP_OFFSET_SHIFT		0
> #define AC_AMPCAP_NUM_STEPS		(0x7f<<8)  /* number of steps */
> #define AC_AMPCAP_NUM_STEPS_SHIFT	8
>-#define AC_AMPCAP_STEP_SIZE		(0x7f<<16) /* step size 0-32dB in 0.25dB */
>+#define AC_AMPCAP_STEP_SIZE		(0x7f<<16) /* step size 0-32dB
>+						    * in 0.25dB
>+						    */
> #define AC_AMPCAP_STEP_SIZE_SHIFT	16
> #define AC_AMPCAP_MUTE			(1<<31)    /* mute capable */
> #define AC_AMPCAP_MUTE_SHIFT		31
>@@ -215,6 +255,9 @@ enum {
> #define AC_PWRST_D3SUP			(1<<3)
> 
> /* Power state values */
>+#define AC_PWRST_SETTING		(0xf<<0)
>+#define AC_PWRST_ACTUAL			(0xf<<4)
>+#define AC_PWRST_ACTUAL_SHIFT		4
> #define AC_PWRST_D0			0x00
> #define AC_PWRST_D1			0x01
> #define AC_PWRST_D2			0x02
>@@ -223,17 +266,18 @@ enum {
> /* Processing capabilies */
> #define AC_PCAP_BENIGN			(1<<0)
> #define AC_PCAP_NUM_COEF		(0xff<<8)
>+#define AC_PCAP_NUM_COEF_SHIFT		8
> 
> /* Volume knobs capabilities */
> #define AC_KNBCAP_NUM_STEPS		(0x7f<<0)
>-#define AC_KNBCAP_DELTA			(1<<8)
>+#define AC_KNBCAP_DELTA			(1<<7)
> 
> /*
>  * Control Parameters
>  */
> 
> /* Amp gain/mute */
>-#define AC_AMP_MUTE			(1<<8)
>+#define AC_AMP_MUTE			(1<<7)
> #define AC_AMP_GAIN			(0x7f)
> #define AC_AMP_GET_INDEX		(0xf<<0)
> 
>@@ -259,6 +303,9 @@ enum {
> #define AC_DIG1_PROFESSIONAL		(1<<6)
> #define AC_DIG1_LEVEL			(1<<7)
> 
>+/* DIGITAL2 bits */
>+#define AC_DIG2_CC			(0x7f<<0)
>+
> /* Pin widget control - 8bit */
> #define AC_PINCTL_VREFEN		(0x7<<0)
> #define AC_PINCTL_VREF_HIZ		0	/* Hi-Z */
>@@ -273,12 +320,22 @@ enum {
> /* Unsolicited response - 8bit */
> #define AC_USRSP_EN			(1<<7)
> 
>+/* Pin sense - 32bit */
>+#define AC_PINSENSE_IMPEDANCE_MASK	(0x7fffffff)
>+#define AC_PINSENSE_PRESENCE		(1<<31)
>+
>+/* EAPD/BTL enable - 32bit */
>+#define AC_EAPDBTL_BALANCED		(1<<0)
>+#define AC_EAPDBTL_EAPD			(1<<1)
>+#define AC_EAPDBTL_LR_SWAP		(1<<2)
>+
> /* 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_MISC			(0xf<<8)
> #define AC_DEFCFG_MISC_SHIFT		8
>+#define AC_DEFCFG_MISC_NO_PRESENCE	(1<<0)
> #define AC_DEFCFG_COLOR			(0xf<<12)
> #define AC_DEFCFG_COLOR_SHIFT		12
> #define AC_DEFCFG_CONN_TYPE		(0xf<<16)
>@@ -409,6 +466,10 @@ struct hda_bus_ops {
> 	unsigned int (*get_response)(struct hda_codec *codec);
> 	/* free the private data */
> 	void (*private_free)(struct hda_bus *);
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	/* notify power-up/down from codec to controller */
>+	void (*pm_notify)(struct hda_codec *codec);
>+#endif
> };
> 
> /* template to pass to the bus constructor */
>@@ -436,7 +497,8 @@ struct hda_bus {
> 
> 	/* codec linked list */
> 	struct list_head codec_list;
>-	struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; /* caddr -> codec */
>+	/* link caddr -> codec */
>+	struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1];
> 
> 	struct mutex cmd_mutex;
> 
>@@ -444,6 +506,9 @@ struct hda_bus {
> 	struct hda_bus_unsolicited *unsol;
> 
> 	struct snd_info_entry *proc;
>+
>+	/* misc op flags */
>+	unsigned int needs_damn_long_delay :1;
> };
> 
> /*
>@@ -458,6 +523,7 @@ struct hda_codec_preset {
> 	unsigned int subs;
> 	unsigned int subs_mask;
> 	unsigned int rev;
>+	hda_nid_t afg, mfg;
> 	const char *name;
> 	int (*patch)(struct hda_codec *codec);
> };
>@@ -469,19 +535,34 @@ struct hda_codec_ops {
> 	int (*init)(struct hda_codec *codec);
> 	void (*free)(struct hda_codec *codec);
> 	void (*unsol_event)(struct hda_codec *codec, unsigned int res);
>-#ifdef CONFIG_PM
>+#ifdef SND_HDA_NEEDS_RESUME
> 	int (*suspend)(struct hda_codec *codec, pm_message_t state);
> 	int (*resume)(struct hda_codec *codec);
> #endif
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	int (*check_power_status)(struct hda_codec *codec, hda_nid_t nid);
>+#endif
> };
> 
> /* record for amp information cache */
>-struct hda_amp_info {
>+struct hda_cache_head {
> 	u32 key;		/* hash key */
>+	u16 val;		/* assigned value */
>+	u16 next;		/* next link; -1 = terminal */
>+};
>+
>+struct hda_amp_info {
>+	struct hda_cache_head head;
> 	u32 amp_caps;		/* amp capabilities */
> 	u16 vol[2];		/* current volume & mute */
>-	u16 status;		/* update flag */
>-	u16 next;		/* next link */
>+};
>+
>+struct hda_cache_rec {
>+	u16 hash[64];			/* hash table for index */
>+	unsigned int num_entries;	/* number of assigned entries */
>+	unsigned int size;		/* allocated size */
>+	unsigned int record_size;	/* record size (including header) */
>+	void *buffer;			/* hash table entries */
> };
> 
> /* PCM callbacks */
>@@ -499,7 +580,7 @@ struct hda_pcm_ops {
> 
> /* PCM information for each substream */
> struct hda_pcm_stream {
>-	unsigned int substreams;	/* number of substreams, 0 = not exist */
>+	unsigned int substreams;	/* number of substreams, 0 = not exist*/
> 	unsigned int channels_min;	/* min. number of channels */
> 	unsigned int channels_max;	/* max. number of channels */
> 	hda_nid_t nid;	/* default NID to query rates/formats/bps, or set up */
>@@ -509,11 +590,21 @@ struct hda_pcm_stream {
> 	struct hda_pcm_ops ops;
> };
> 
>+/* PCM types */
>+enum {
>+	HDA_PCM_TYPE_AUDIO,
>+	HDA_PCM_TYPE_SPDIF,
>+	HDA_PCM_TYPE_HDMI,
>+	HDA_PCM_TYPE_MODEM,
>+	HDA_PCM_NTYPES
>+};
>+
> /* for PCM creation */
> struct hda_pcm {
> 	char *name;
> 	struct hda_pcm_stream stream[2];
>-	unsigned int is_modem;	/* modem codec? */
>+	unsigned int pcm_type;	/* HDA_PCM_TYPE_XXX */
>+	int device;	/* assigned device number */
> };
> 
> /* codec information */
>@@ -536,11 +627,6 @@ struct hda_codec {
> 	/* set by patch */
> 	struct hda_codec_ops patch_ops;
> 
>-	/* resume phase - all controls should update even if
>-	 * the values are not changed
>-	 */
>-	unsigned int in_resume;
>-
> 	/* PCM to create, set by patch_ops.build_pcms callback */
> 	unsigned int num_pcms;
> 	struct hda_pcm *pcm_info;
>@@ -553,16 +639,22 @@ struct hda_codec {
> 	hda_nid_t start_nid;
> 	u32 *wcaps;
> 
>-	/* hash for amp access */
>-	u16 amp_hash[32];
>-	int num_amp_entries;
>-	int amp_info_size;
>-	struct hda_amp_info *amp_info;
>+	struct hda_cache_rec amp_cache;	/* cache for amp access */
>+	struct hda_cache_rec cmd_cache;	/* cache for other commands */
> 
> 	struct mutex spdif_mutex;
> 	unsigned int spdif_status;	/* IEC958 status bits */
> 	unsigned short spdif_ctls;	/* SPDIF control bits */
> 	unsigned int spdif_in_enable;	/* SPDIF input enable? */
>+
>+	struct snd_hwdep *hwdep;	/* assigned hwdep device */
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	unsigned int power_on :1;	/* current (global) power-state */
>+	unsigned int power_transition :1; /* power-state in transition */
>+	int power_count;	/* current (global) power refcount */
>+	struct work_struct power_work; /* delayed task for powerdown */
>+#endif
> };
> 
> /* direction */
>@@ -582,13 +674,17 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
> /*
>  * low level functions
>  */
>-unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid, int direct,
>+unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid,
>+				int direct,
> 				unsigned int verb, unsigned int parm);
> int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct,
> 			unsigned int verb, unsigned int parm);
>-#define snd_hda_param_read(codec, nid, param) snd_hda_codec_read(codec, nid, 0, AC_VERB_PARAMETERS, param)
>-int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *start_id);
>-int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *conn_list, int max_conns);
>+#define snd_hda_param_read(codec, nid, param) \
>+	snd_hda_codec_read(codec, nid, 0, AC_VERB_PARAMETERS, param)
>+int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid,
>+			  hda_nid_t *start_id);
>+int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
>+			    hda_nid_t *conn_list, int max_conns);
> 
> struct hda_verb {
> 	hda_nid_t nid;
>@@ -596,11 +692,24 @@ struct hda_verb {
> 	u32 param;
> };
> 
>-void snd_hda_sequence_write(struct hda_codec *codec, const struct hda_verb *seq);
>+void snd_hda_sequence_write(struct hda_codec *codec,
>+			    const struct hda_verb *seq);
> 
> /* unsolicited event */
> int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex);
> 
>+/* cached write */
>+#ifdef SND_HDA_NEEDS_RESUME
>+int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid,
>+			      int direct, unsigned int verb, unsigned int parm);
>+void snd_hda_sequence_write_cache(struct hda_codec *codec,
>+				  const struct hda_verb *seq);
>+void snd_hda_codec_resume_cache(struct hda_codec *codec);
>+#else
>+#define snd_hda_codec_write_cache	snd_hda_codec_write
>+#define snd_hda_sequence_write_cache	snd_hda_sequence_write
>+#endif
>+
> /*
>  * Mixer
>  */
>@@ -610,10 +719,14 @@ int snd_hda_build_controls(struct hda_bus *bus);
>  * PCM
>  */
> int snd_hda_build_pcms(struct hda_bus *bus);
>-void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, u32 stream_tag,
>+void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
>+				u32 stream_tag,
> 				int channel_id, int format);
>-unsigned int snd_hda_calc_stream_format(unsigned int rate, unsigned int channels,
>-					unsigned int format, unsigned int maxbps);
>+void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid);
>+unsigned int snd_hda_calc_stream_format(unsigned int rate,
>+					unsigned int channels,
>+					unsigned int format,
>+					unsigned int maxbps);
> int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
> 				u32 *ratesp, u64 *formatsp, unsigned int *bpsp);
> int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,
>@@ -632,4 +745,19 @@ int snd_hda_suspend(struct hda_bus *bus, pm_message_t state);
> int snd_hda_resume(struct hda_bus *bus);
> #endif
> 
>+/*
>+ * power saving
>+ */
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+void snd_hda_power_up(struct hda_codec *codec);
>+void snd_hda_power_down(struct hda_codec *codec);
>+#define snd_hda_codec_needs_resume(codec) codec->power_count
>+int snd_hda_codecs_inuse(struct hda_bus *bus);
>+#else
>+static inline void snd_hda_power_up(struct hda_codec *codec) {}
>+static inline void snd_hda_power_down(struct hda_codec *codec) {}
>+#define snd_hda_codec_needs_resume(codec) 1
>+#define snd_hda_codecs_inuse(bus) 1
>+#endif
>+
> #endif /* __SOUND_HDA_CODEC_H */
>diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
>index 1589d2f..b2908b8 100644
>--- a/sound/pci/hda/hda_generic.c
>+++ b/sound/pci/hda/hda_generic.c
>@@ -23,7 +23,6 @@
> #include <sound/driver.h>
> #include <linux/init.h>
> #include <linux/slab.h>
>-#include <linux/pci.h>
> #include <sound/core.h>
> #include "hda_codec.h"
> #include "hda_local.h"
>@@ -71,6 +70,13 @@ struct hda_gspec {
> 	struct hda_pcm pcm_rec;		/* PCM information */
> 
> 	struct list_head nid_list;	/* list of widgets */
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+#define MAX_LOOPBACK_AMPS	7
>+	struct hda_loopback_check loopback;
>+	int num_loopbacks;
>+	struct hda_amp_list loopback_list[MAX_LOOPBACK_AMPS + 1];
>+#endif
> };
> 
> /*
>@@ -89,13 +95,12 @@ struct hda_gspec {
> static void snd_hda_generic_free(struct hda_codec *codec)
> {
> 	struct hda_gspec *spec = codec->spec;
>-	struct list_head *p, *n;
>+	struct hda_gnode *node, *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);
>+	list_for_each_entry_safe(node, n, &spec->nid_list, list) {
> 		if (node->conn_list != node->slist)
> 			kfree(node->conn_list);
> 		kfree(node);
>@@ -134,7 +139,7 @@ static int add_new_node(struct hda_codec *codec, struct hda_gspec *spec, hda_nid
> 			return -ENOMEM;
> 		}
> 	}
>-	memcpy(node->conn_list, conn_list, nconns);
>+	memcpy(node->conn_list, conn_list, nconns * sizeof(hda_nid_t));
> 	node->nconns = nconns;
> 	node->wid_caps = get_wcaps(codec, nid);
> 	node->type = (node->wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
>@@ -197,11 +202,9 @@ static int build_afg_tree(struct hda_codec *codec)
> /* FIXME: should avoid the braindead linear search */
> 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);
>+	list_for_each_entry(node, &spec->nid_list, list) {
> 		if (node->nid == nid)
> 			return node;
> 	}
>@@ -219,9 +222,8 @@ static int unmute_output(struct hda_codec *codec, struct hda_gnode *node)
> 	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);
>+	snd_hda_codec_amp_stereo(codec, node->nid, HDA_OUTPUT, 0, 0xff, val);
>+	return 0;
> }
> 
> /*
>@@ -235,11 +237,8 @@ static int unmute_input(struct hda_codec *codec, struct hda_gnode *node, unsigne
> 	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);
>+	snd_hda_codec_amp_stereo(codec, node->nid, HDA_INPUT, index, 0xff, val);
>+	return 0;
> }
> 
> /*
>@@ -249,7 +248,8 @@ static int select_input_connection(struct hda_codec *codec, struct hda_gnode *no
> 				   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);
>+	return snd_hda_codec_write_cache(codec, node->nid, 0,
>+					 AC_VERB_SET_CONNECT_SEL, index);
> }
> 
> /*
>@@ -257,11 +257,9 @@ static int select_input_connection(struct hda_codec *codec, struct hda_gnode *no
>  */
> 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);
>+	list_for_each_entry(node, &spec->nid_list, list) {
> 		node->checked = 0;
> 	}
> }
>@@ -344,12 +342,10 @@ 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);
>+	list_for_each_entry(node, &spec->nid_list, list) {
> 		if (node->type != AC_WID_PIN)
> 			continue;
> 		/* output capable? */
>@@ -380,7 +376,7 @@ static struct hda_gnode *parse_output_jack(struct hda_codec *codec,
> 			/* unmute the PIN output */
> 			unmute_output(codec, node);
> 			/* set PIN-Out enable */
>-			snd_hda_codec_write(codec, node->nid, 0,
>+			snd_hda_codec_write_cache(codec, node->nid, 0,
> 					    AC_VERB_SET_PIN_WIDGET_CONTROL,
> 					    AC_PINCTL_OUT_EN |
> 					    ((node->pin_caps & AC_PINCAP_HP_DRV) ?
>@@ -571,7 +567,8 @@ static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
> 	/* 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);
>+	snd_hda_codec_write_cache(codec, node->nid, 0,
>+				  AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);
> 
> 	return 1; /* found */
> }
>@@ -660,7 +657,6 @@ static int parse_input_path(struct hda_codec *codec, struct hda_gnode *adc_node)
> static int parse_input(struct hda_codec *codec)
> {
> 	struct hda_gspec *spec = codec->spec;
>-	struct list_head *p;
> 	struct hda_gnode *node;
> 	int err;
> 
>@@ -669,8 +665,7 @@ static int parse_input(struct hda_codec *codec)
> 	 * 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);
>+	list_for_each_entry(node, &spec->nid_list, list) {
> 		if (node->wid_caps & AC_WCAP_DIGITAL)
> 			continue; /* skip SPDIF */
> 		if (node->type == AC_WID_AUD_IN) {
>@@ -685,11 +680,33 @@ static int parse_input(struct hda_codec *codec)
> 	return 0;
> }
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static void add_input_loopback(struct hda_codec *codec, hda_nid_t nid,
>+			       int dir, int idx)
>+{
>+	struct hda_gspec *spec = codec->spec;
>+	struct hda_amp_list *p;
>+
>+	if (spec->num_loopbacks >= MAX_LOOPBACK_AMPS) {
>+		snd_printk(KERN_ERR "hda_generic: Too many loopback ctls\n");
>+		return;
>+	}
>+	p = &spec->loopback_list[spec->num_loopbacks++];
>+	p->nid = nid;
>+	p->dir = dir;
>+	p->idx = idx;
>+	spec->loopback.amplist = spec->loopback_list;
>+}
>+#else
>+#define add_input_loopback(codec,nid,dir,idx)
>+#endif
>+
> /*
>  * create mixer controls if possible
>  */
> static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
>-			unsigned int index, const char *type, const char *dir_sfx)
>+			unsigned int index, const char *type,
>+			const char *dir_sfx, int is_loopback)
> {
> 	char name[32];
> 	int err;
>@@ -703,6 +720,8 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
> 	if ((node->wid_caps & AC_WCAP_IN_AMP) &&
> 	    (node->amp_in_caps & AC_AMPCAP_MUTE)) {
> 		knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node->nid, index, HDA_INPUT);
>+		if (is_loopback)
>+			add_input_loopback(codec, node->nid, HDA_INPUT, index);
> 		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;
>@@ -710,6 +729,8 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
> 	} else if ((node->wid_caps & AC_WCAP_OUT_AMP) &&
> 		   (node->amp_out_caps & AC_AMPCAP_MUTE)) {
> 		knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node->nid, 0, HDA_OUTPUT);
>+		if (is_loopback)
>+			add_input_loopback(codec, node->nid, HDA_OUTPUT, 0);
> 		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;
>@@ -768,7 +789,7 @@ static int create_output_mixers(struct hda_codec *codec, const char **names)
> 	for (i = 0; i < spec->pcm_vol_nodes; i++) {
> 		err = create_mixer(codec, spec->pcm_vol[i].node,
> 				   spec->pcm_vol[i].index,
>-				   names[i], "Playback");
>+				   names[i], "Playback", 0);
> 		if (err < 0)
> 			return err;
> 	}
>@@ -785,7 +806,7 @@ static int build_output_controls(struct hda_codec *codec)
> 	case 1:
> 		return create_mixer(codec, spec->pcm_vol[0].node,
> 				    spec->pcm_vol[0].index,
>-				    "Master", "Playback");
>+				    "Master", "Playback", 0);
> 	case 2:
> 		if (defcfg_type(spec->out_pin_node[0]) == AC_JACK_SPEAKER)
> 			return create_output_mixers(codec, types_speaker);
>@@ -821,7 +842,7 @@ static int build_input_controls(struct hda_codec *codec)
> 	if (spec->input_mux.num_items == 1) {
> 		err = create_mixer(codec, adc_node,
> 				   spec->input_mux.items[0].index,
>-				   NULL, "Capture");
>+				   NULL, "Capture", 0);
> 		if (err < 0)
> 			return err;
> 		return 0;
>@@ -887,7 +908,8 @@ static int parse_loopback_path(struct hda_codec *codec, struct hda_gspec *spec,
> 			return err;
> 		else if (err >= 1) {
> 			if (err == 1) {
>-				err = create_mixer(codec, node, i, type, "Playback");
>+				err = create_mixer(codec, node, i, type,
>+						   "Playback", 1);
> 				if (err < 0)
> 					return err;
> 				if (err > 0)
>@@ -912,7 +934,6 @@ static int parse_loopback_path(struct hda_codec *codec, struct hda_gspec *spec,
> 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;
>@@ -920,8 +941,7 @@ static int build_loopback_controls(struct hda_codec *codec)
> 	if (! spec->out_pin_node[0])
> 		return 0;
> 
>-	list_for_each(p, &spec->nid_list) {
>-		node = list_entry(p, struct hda_gnode, list);
>+	list_for_each_entry(node, &spec->nid_list, list) {
> 		if (node->type != AC_WID_PIN)
> 			continue;
> 		/* input capable? */
>@@ -988,8 +1008,8 @@ static int generic_pcm2_cleanup(struct hda_pcm_stream *hinfo,
> {
> 	struct hda_gspec *spec = codec->spec;
> 
>-	snd_hda_codec_setup_stream(codec, hinfo->nid, 0, 0, 0);
>-	snd_hda_codec_setup_stream(codec, spec->dac_node[1]->nid, 0, 0, 0);
>+	snd_hda_codec_cleanup_stream(codec, hinfo->nid);
>+	snd_hda_codec_cleanup_stream(codec, spec->dac_node[1]->nid);
> 	return 0;
> }
> 
>@@ -1023,6 +1043,14 @@ static int build_generic_pcms(struct hda_codec *codec)
> 	return 0;
> }
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static int generic_check_power_status(struct hda_codec *codec, hda_nid_t nid)
>+{
>+	struct hda_gspec *spec = codec->spec;
>+	return snd_hda_check_amp_list_power(codec, &spec->loopback, nid);
>+}
>+#endif
>+
> 
> /*
>  */
>@@ -1030,6 +1058,9 @@ static struct hda_codec_ops generic_patch_ops = {
> 	.build_controls = build_generic_controls,
> 	.build_pcms = build_generic_pcms,
> 	.free = snd_hda_generic_free,
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	.check_power_status = generic_check_power_status,
>+#endif
> };
> 
> /*
>diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
>new file mode 100644
>index 0000000..075d315
>--- /dev/null
>+++ b/sound/pci/hda/hda_hwdep.c
>@@ -0,0 +1,122 @@
>+/*
>+ * HWDEP Interface for HD-audio codec
>+ *
>+ * Copyright (c) 2007 Takashi Iwai <tiwai@suse.de>
>+ *
>+ *  This driver is free software; you can redistribute it and/or modify
>+ *  it under the terms of the GNU General Public License as published by
>+ *  the Free Software Foundation; either version 2 of the License, or
>+ *  (at your option) any later version.
>+ *
>+ *  This driver is distributed in the hope that it will be useful,
>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>+ *  GNU General Public License for more details.
>+ *
>+ *  You should have received a copy of the GNU General Public License
>+ *  along with this program; if not, write to the Free Software
>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
>+ */
>+
>+#include <sound/driver.h>
>+#include <linux/init.h>
>+#include <linux/slab.h>
>+#include <linux/pci.h>
>+#include <linux/compat.h>
>+#include <linux/mutex.h>
>+#include <sound/core.h>
>+#include "hda_codec.h"
>+#include "hda_local.h"
>+#include <sound/hda_hwdep.h>
>+
>+/*
>+ * write/read an out-of-bound verb
>+ */
>+static int verb_write_ioctl(struct hda_codec *codec,
>+			    struct hda_verb_ioctl __user *arg)
>+{
>+	u32 verb, res;
>+
>+	if (get_user(verb, &arg->verb))
>+		return -EFAULT;
>+	res = snd_hda_codec_read(codec, verb >> 24, 0,
>+				 (verb >> 8) & 0xffff, verb & 0xff);
>+	if (put_user(res, &arg->res))
>+		return -EFAULT;
>+	return 0;
>+}
>+
>+static int get_wcap_ioctl(struct hda_codec *codec,
>+			  struct hda_verb_ioctl __user *arg)
>+{
>+	u32 verb, res;
>+	
>+	if (get_user(verb, &arg->verb))
>+		return -EFAULT;
>+	res = get_wcaps(codec, verb >> 24);
>+	if (put_user(res, &arg->res))
>+		return -EFAULT;
>+	return 0;
>+}
>+
>+
>+/*
>+ */
>+static int hda_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
>+			   unsigned int cmd, unsigned long arg)
>+{
>+	struct hda_codec *codec = hw->private_data;
>+	void __user *argp = (void __user *)arg;
>+
>+	switch (cmd) {
>+	case HDA_IOCTL_PVERSION:
>+		return put_user(HDA_HWDEP_VERSION, (int __user *)argp);
>+	case HDA_IOCTL_VERB_WRITE:
>+		return verb_write_ioctl(codec, argp);
>+	case HDA_IOCTL_GET_WCAP:
>+		return get_wcap_ioctl(codec, argp);
>+	}
>+	return -ENOIOCTLCMD;
>+}
>+
>+#ifdef CONFIG_COMPAT
>+static int hda_hwdep_ioctl_compat(struct snd_hwdep *hw, struct file *file,
>+				  unsigned int cmd, unsigned long arg)
>+{
>+	return hda_hwdep_ioctl(hw, file, cmd, (unsigned long)compat_ptr(arg));
>+}
>+#endif
>+
>+static int hda_hwdep_open(struct snd_hwdep *hw, struct file *file)
>+{
>+#ifndef CONFIG_SND_DEBUG_VERBOSE
>+	if (!capable(CAP_SYS_RAWIO))
>+		return -EACCES;
>+#endif
>+	return 0;
>+}
>+
>+int __devinit snd_hda_create_hwdep(struct hda_codec *codec)
>+{
>+	char hwname[16];
>+	struct snd_hwdep *hwdep;
>+	int err;
>+
>+	sprintf(hwname, "HDA Codec %d", codec->addr);
>+	err = snd_hwdep_new(codec->bus->card, hwname, codec->addr, &hwdep);
>+	if (err < 0)
>+		return err;
>+	codec->hwdep = hwdep;
>+	sprintf(hwdep->name, "HDA Codec %d", codec->addr);
>+	hwdep->iface = SNDRV_HWDEP_IFACE_HDA;
>+	hwdep->private_data = codec;
>+	hwdep->exclusive = 1;
>+
>+	hwdep->ops.open = hda_hwdep_open;
>+	hwdep->ops.ioctl = hda_hwdep_ioctl;
>+#ifdef CONFIG_COMPAT
>+	hwdep->ops.ioctl_compat = hda_hwdep_ioctl_compat;
>+#endif
>+
>+	return 0;
>+}
>diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
>index 392548e..a56bb69 100644
>--- a/sound/pci/hda/hda_intel.c
>+++ b/sound/pci/hda/hda_intel.c
>@@ -1,6 +1,7 @@
> /*
>  *
>- *  hda_intel.c - Implementation of primary alsa driver code base for Intel HD Audio.
>+ *  hda_intel.c - Implementation of primary alsa driver code base
>+ *                for Intel HD Audio.
>  *
>  *  Copyright(c) 2004 Intel Corporation. All rights reserved.
>  *
>@@ -39,6 +40,7 @@
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
>+#include <linux/dma-mapping.h>
> #include <linux/moduleparam.h>
> #include <linux/init.h>
> #include <linux/slab.h>
>@@ -49,33 +51,45 @@
> #include "hda_codec.h"
> 
> 
>-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 index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
>+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
>+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
>+static char *model[SNDRV_CARDS];
>+static int position_fix[SNDRV_CARDS];
>+static int probe_mask[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};
> static int single_cmd;
> static int enable_msi;
> 
>-module_param(index, int, 0444);
>+module_param_array(index, int, NULL, 0444);
> MODULE_PARM_DESC(index, "Index value for Intel HD audio interface.");
>-module_param(id, charp, 0444);
>+module_param_array(id, charp, NULL, 0444);
> MODULE_PARM_DESC(id, "ID string for Intel HD audio interface.");
>-module_param(model, charp, 0444);
>+module_param_array(enable, bool, NULL, 0444);
>+MODULE_PARM_DESC(enable, "Enable Intel HD audio interface.");
>+module_param_array(model, charp, NULL, 0444);
> MODULE_PARM_DESC(model, "Use the given board model.");
>-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_param_array(position_fix, int, NULL, 0444);
>+MODULE_PARM_DESC(position_fix, "Fix DMA pointer "
>+		 "(0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size).");
>+module_param_array(probe_mask, int, NULL, 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).");
>-module_param(enable_msi, int, 0);
>+MODULE_PARM_DESC(single_cmd, "Use single command to communicate with codecs "
>+		 "(for debugging only).");
>+module_param(enable_msi, int, 0444);
> MODULE_PARM_DESC(enable_msi, "Enable Message Signaled Interrupt (MSI)");
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+/* power_save option is defined in hda_codec.c */
> 
>-/* just for backward compatibility */
>-static int enable;
>-module_param(enable, bool, 0444);
>+/* reset the HD-audio controller in power save mode.
>+ * this may give more power-saving, but will take longer time to
>+ * wake up.
>+ */
>+static int power_save_controller = 1;
>+module_param(power_save_controller, bool, 0644);
>+MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode.");
>+#endif
> 
> MODULE_LICENSE("GPL");
> MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
>@@ -85,6 +99,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
> 			 "{Intel, ICH8},"
> 			 "{Intel, ICH9},"
> 			 "{Intel, ICH10},"
>+			 "{Intel, SCH},"
> 			 "{ATI, SB450},"
> 			 "{ATI, SB600},"
> 			 "{ATI, RS600},"
>@@ -105,6 +120,7 @@ MODULE_DESCRIPTION("Intel HDA driver");
> 
> #define SFX	"hda-intel: "
> 
>+
> /*
>  * registers
>  */
>@@ -171,35 +187,32 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
> 
> /* max number of SDs */
> /* 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
> 
> /* ATI HDMI has 1 playback and 0 capture */
>-#define ATIHDMI_CAPTURE_INDEX	0
> #define ATIHDMI_NUM_CAPTURE	0
>-#define ATIHDMI_PLAYBACK_INDEX	0
> #define ATIHDMI_NUM_PLAYBACK	1
> 
>+/* TERA has 4 playback and 3 capture */
>+#define TERA_NUM_CAPTURE	3
>+#define TERA_NUM_PLAYBACK	4
>+
> /* 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 BDL_SIZE		PAGE_ALIGN(8192)
>-#define AZX_MAX_FRAG		(BDL_SIZE / (MAX_AZX_DEV * 16))
>+#define BDL_SIZE		4096
>+#define AZX_MAX_BDL_ENTRIES	(BDL_SIZE / 16)
>+#define AZX_MAX_FRAG		32
> /* 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_AUDIO_PCMS	6
>-#define AZX_MAX_MODEM_PCMS	2
>-#define AZX_MAX_PCMS		(AZX_MAX_AUDIO_PCMS + AZX_MAX_MODEM_PCMS)
>+#define AZX_MAX_PCMS		8
> 
> /* RIRB int mask: overrun[2], response[0] */
> #define RIRB_INT_RESPONSE	0x01
>@@ -207,11 +220,15 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
> #define RIRB_INT_MASK		0x05
> 
> /* STATESTS int mask: SD2,SD1,SD0 */
>+#define AZX_MAX_CODECS		3
> #define STATESTS_INT_MASK	0x07
> 
> /* SD_CTL bits */
> #define SD_CTL_STREAM_RESET	0x01	/* stream reset bit */
> #define SD_CTL_DMA_START	0x02	/* stream DMA start bit */
>+#define SD_CTL_STRIPE		(3 << 16)	/* stripe control */
>+#define SD_CTL_TRAFFIC_PRIO	(1 << 18)	/* traffic priority */
>+#define SD_CTL_DIR		(1 << 19)	/* bi-directional stream */
> #define SD_CTL_STREAM_TAG_MASK	(0xf << 20)
> #define SD_CTL_STREAM_TAG_SHIFT	20
> 
>@@ -219,15 +236,16 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
> #define SD_INT_DESC_ERR		0x10	/* descriptor error interrupt */
> #define SD_INT_FIFO_ERR		0x08	/* FIFO error interrupt */
> #define SD_INT_COMPLETE		0x04	/* completion interrupt */
>-#define SD_INT_MASK		(SD_INT_DESC_ERR|SD_INT_FIFO_ERR|SD_INT_COMPLETE)
>+#define SD_INT_MASK		(SD_INT_DESC_ERR|SD_INT_FIFO_ERR|\
>+				 SD_INT_COMPLETE)
> 
> /* SD_STS */
> #define SD_STS_FIFO_READY	0x20	/* FIFO ready */
> 
> /* INTCTL and INTSTS */
>-#define ICH6_INT_ALL_STREAM	0xff		/* all stream interrupts */
>-#define ICH6_INT_CTRL_EN	0x40000000	/* controller interrupt enable bit */
>-#define ICH6_INT_GLOBAL_EN	0x80000000	/* global interrupt enable bit */
>+#define ICH6_INT_ALL_STREAM	0xff	   /* all stream interrupts */
>+#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)
>@@ -259,33 +277,40 @@ enum {
> #define NVIDIA_HDA_TRANSREG_ADDR      0x4e
> #define NVIDIA_HDA_ENABLE_COHBITS     0x0f
> 
>+/* Defines for Intel SCH HDA snoop control */
>+#define INTEL_SCH_HDA_DEVC      0x78
>+#define INTEL_SCH_HDA_DEVC_NOSNOOP       (0x1<<11)
>+
>+
> /*
>  */
> 
> struct azx_dev {
>-	u32 *bdl;			/* virtual address of the BDL */
>-	dma_addr_t bdl_addr;		/* physical address of the BDL */
>-	u32 *posbuf;			/* position buffer pointer */
>+	struct snd_dma_buffer bdl; /* BDL buffer */
>+	u32 *posbuf;		/* position buffer pointer */
> 
>-	unsigned int bufsize;		/* size of the play buffer in bytes */
>-	unsigned int fragsize;		/* size of each period in bytes */
>-	unsigned int frags;		/* number for period in the play buffer */
>-	unsigned int fifo_size;		/* FIFO size */
>+	unsigned int bufsize;	/* size of the play buffer in bytes */
>+	unsigned int period_bytes; /* size of the period in bytes */
>+	unsigned int frags;	/* number for period in the play buffer */
>+	unsigned int fifo_size;	/* FIFO size */
> 
>-	void __iomem *sd_addr;		/* stream descriptor pointer */
>+	void __iomem *sd_addr;	/* stream descriptor pointer */
> 
>-	u32 sd_int_sta_mask;		/* stream int status mask */
>+	u32 sd_int_sta_mask;	/* stream int status mask */
> 
> 	/* pcm support */
>-	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 */
>+	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 */
> 	unsigned char index;		/* stream index */
>-	/* for sanity check of position buffer */
>-	unsigned int period_intr;
> 
> 	unsigned int opened :1;
> 	unsigned int running :1;
>+	unsigned int irq_pending: 1;
> };
> 
> /* CORB/RIRB */
>@@ -325,7 +350,6 @@ struct azx {
> 	struct azx_dev *azx_dev;
> 
> 	/* PCM */
>-	unsigned int pcm_devs;
> 	struct snd_pcm *pcm[AZX_MAX_PCMS];
> 
> 	/* HD codec */
>@@ -336,38 +360,48 @@ struct azx {
> 	struct azx_rb corb;
> 	struct azx_rb rirb;
> 
>-	/* BDL, CORB/RIRB and position buffers */
>-	struct snd_dma_buffer bdl;
>+	/* CORB/RIRB and position buffers */
> 	struct snd_dma_buffer rb;
> 	struct snd_dma_buffer posbuf;
> 
> 	/* flags */
> 	int position_fix;
>+	unsigned int running :1;
> 	unsigned int initialized :1;
> 	unsigned int single_cmd :1;
> 	unsigned int polling_mode :1;
> 	unsigned int msi :1;
>+
>+	/* for debugging */
>+	unsigned int last_cmd;	/* last issued command (to sync) */
>+
>+	/* for pending irqs */
>+	struct work_struct irq_pending_work;
> };
> 
> /* driver types */
> enum {
> 	AZX_DRIVER_ICH,
>+	AZX_DRIVER_SCH,
> 	AZX_DRIVER_ATI,
> 	AZX_DRIVER_ATIHDMI,
> 	AZX_DRIVER_VIA,
> 	AZX_DRIVER_SIS,
> 	AZX_DRIVER_ULI,
> 	AZX_DRIVER_NVIDIA,
>+	AZX_DRIVER_TERA,
> };
> 
> static char *driver_short_names[] __devinitdata = {
> 	[AZX_DRIVER_ICH] = "HDA Intel",
>+	[AZX_DRIVER_SCH] = "HDA Intel MID",
> 	[AZX_DRIVER_ATI] = "HDA ATI SB",
> 	[AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI",
> 	[AZX_DRIVER_VIA] = "HDA VIA VT82xx",
> 	[AZX_DRIVER_SIS] = "HDA SIS966",
> 	[AZX_DRIVER_ULI] = "HDA ULI M5461",
> 	[AZX_DRIVER_NVIDIA] = "HDA NVidia",
>+	[AZX_DRIVER_TERA] = "HDA Teradici", 
> };
> 
> /*
>@@ -421,7 +455,8 @@ static int azx_alloc_cmd_io(struct azx *chip)
> 	int err;
> 
> 	/* single page (at least 4096 bytes) must suffice for both ringbuffes */
>-	err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
>+	err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
>+				  snd_dma_pci_data(chip->pci),
> 				  PAGE_SIZE, &chip->rb);
> 	if (err < 0) {
> 		snd_printk(KERN_ERR SFX "cannot allocate CORB/RIRB\n");
>@@ -472,18 +507,10 @@ static void azx_free_cmd_io(struct azx *chip)
> }
> 
> /* send a command */
>-static int azx_corb_send_cmd(struct hda_codec *codec, hda_nid_t nid, int direct,
>-			     unsigned int verb, unsigned int para)
>+static int azx_corb_send_cmd(struct hda_codec *codec, u32 val)
> {
> 	struct azx *chip = codec->bus->private_data;
> 	unsigned int wp;
>-	u32 val;
>-
>-	val = (u32)(codec->addr & 0x0f) << 28;
>-	val |= (u32)direct << 27;
>-	val |= (u32)nid << 20;
>-	val |= verb << 8;
>-	val |= para;
> 
> 	/* add command to corb */
> 	wp = azx_readb(chip, CORBWP);
>@@ -522,8 +549,9 @@ static void azx_update_rirb(struct azx *chip)
> 		if (res_ex & ICH6_RIRB_EX_UNSOL_EV)
> 			snd_hda_queue_unsol_event(chip->bus, res, res_ex);
> 		else if (chip->rirb.cmds) {
>-			chip->rirb.cmds--;
> 			chip->rirb.res = res;
>+			smp_wmb();
>+			chip->rirb.cmds--;
> 		}
> 	}
> }
>@@ -536,20 +564,29 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec)
> 
>  again:
> 	timeout = jiffies + msecs_to_jiffies(1000);
>-	do {
>+	for (;;) {
> 		if (chip->polling_mode) {
> 			spin_lock_irq(&chip->reg_lock);
> 			azx_update_rirb(chip);
> 			spin_unlock_irq(&chip->reg_lock);
> 		}
>-		if (! chip->rirb.cmds)
>+		if (!chip->rirb.cmds) {
>+			smp_rmb();
> 			return chip->rirb.res; /* the last value */
>-		schedule_timeout(1);
>-	} while (time_after_eq(timeout, jiffies));
>+		}
>+		if (time_after(jiffies, timeout))
>+			break;
>+		if (codec->bus->needs_damn_long_delay)
>+			msleep(2); /* temporary workaround */
>+		else {
>+			udelay(10);
>+			cond_resched();
>+		}
>+	}
> 
> 	if (chip->msi) {
> 		snd_printk(KERN_WARNING "hda_intel: No response from codec, "
>-			   "disabling MSI...\n");
>+			   "disabling MSI: last cmd=0x%08x\n", chip->last_cmd);
> 		free_irq(chip->irq, chip);
> 		chip->irq = -1;
> 		pci_disable_msi(chip->pci);
>@@ -561,13 +598,15 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec)
> 
> 	if (!chip->polling_mode) {
> 		snd_printk(KERN_WARNING "hda_intel: azx_get_response timeout, "
>-			   "switching to polling mode...\n");
>+			   "switching to polling mode: last cmd=0x%08x\n",
>+			   chip->last_cmd);
> 		chip->polling_mode = 1;
> 		goto again;
> 	}
> 
> 	snd_printk(KERN_ERR "hda_intel: azx_get_response timeout, "
>-		   "switching to single_cmd mode...\n");
>+		   "switching to single_cmd mode: last cmd=0x%08x\n",
>+		   chip->last_cmd);
> 	chip->rirb.rp = azx_readb(chip, RIRBWP);
> 	chip->rirb.cmds = 0;
> 	/* switch to single_cmd mode */
>@@ -587,32 +626,27 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec)
>  */
> 
> /* send a command */
>-static int azx_single_send_cmd(struct hda_codec *codec, hda_nid_t nid,
>-			       int direct, unsigned int verb,
>-			       unsigned int para)
>+static int azx_single_send_cmd(struct hda_codec *codec, u32 val)
> {
> 	struct azx *chip = codec->bus->private_data;
>-	u32 val;
> 	int timeout = 50;
> 
>-	val = (u32)(codec->addr & 0x0f) << 28;
>-	val |= (u32)direct << 27;
>-	val |= (u32)nid << 20;
>-	val |= verb << 8;
>-	val |= para;
>-
> 	while (timeout--) {
> 		/* check ICB busy bit */
>-		if (! (azx_readw(chip, IRS) & ICH6_IRS_BUSY)) {
>+		if (!((azx_readw(chip, IRS) & ICH6_IRS_BUSY))) {
> 			/* Clear IRV valid bit */
>-			azx_writew(chip, IRS, azx_readw(chip, IRS) | ICH6_IRS_VALID);
>+			azx_writew(chip, IRS, azx_readw(chip, IRS) |
>+				   ICH6_IRS_VALID);
> 			azx_writel(chip, IC, val);
>-			azx_writew(chip, IRS, azx_readw(chip, IRS) | ICH6_IRS_BUSY);
>+			azx_writew(chip, IRS, azx_readw(chip, IRS) |
>+				   ICH6_IRS_BUSY);
> 			return 0;
> 		}
> 		udelay(1);
> 	}
>-	snd_printd(SFX "send_cmd timeout: IRS=0x%x, val=0x%x\n", azx_readw(chip, IRS), val);
>+	if (printk_ratelimit())
>+		snd_printd(SFX "send_cmd timeout: IRS=0x%x, val=0x%x\n",
>+			   azx_readw(chip, IRS), val);
> 	return -EIO;
> }
> 
>@@ -628,7 +662,9 @@ static unsigned int azx_single_get_response(struct hda_codec *codec)
> 			return azx_readl(chip, IR);
> 		udelay(1);
> 	}
>-	snd_printd(SFX "get_response timeout: IRS=0x%x\n", azx_readw(chip, IRS));
>+	if (printk_ratelimit())
>+		snd_printd(SFX "get_response timeout: IRS=0x%x\n",
>+			   azx_readw(chip, IRS));
> 	return (unsigned int)-1;
> }
> 
>@@ -645,10 +681,19 @@ static int azx_send_cmd(struct hda_codec *codec, hda_nid_t nid,
> 			unsigned int para)
> {
> 	struct azx *chip = codec->bus->private_data;
>+	u32 val;
>+
>+	val = (u32)(codec->addr & 0x0f) << 28;
>+	val |= (u32)direct << 27;
>+	val |= (u32)nid << 20;
>+	val |= verb << 8;
>+	val |= para;
>+	chip->last_cmd = val;
>+
> 	if (chip->single_cmd)
>-		return azx_single_send_cmd(codec, nid, direct, verb, para);
>+		return azx_single_send_cmd(codec, val);
> 	else
>-		return azx_corb_send_cmd(codec, nid, direct, verb, para);
>+		return azx_corb_send_cmd(codec, val);
> }
> 
> /* get a response */
>@@ -661,12 +706,18 @@ static unsigned int azx_get_response(struct hda_codec *codec)
> 		return azx_rirb_get_response(codec);
> }
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static void azx_power_notify(struct hda_codec *codec);
>+#endif
> 
> /* reset codec link */
> static int azx_reset(struct azx *chip)
> {
> 	int count;
> 
>+	/* clear STATESTS */
>+	azx_writeb(chip, STATESTS, STATESTS_INT_MASK);
>+
> 	/* reset controller */
> 	azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_RESET);
> 
>@@ -786,18 +837,12 @@ static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
> 
> 
> /*
>- * initialize the chip
>+ * reset and start the controller registers
>  */
> 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);
>+	if (chip->initialized)
>+		return;
> 
> 	/* reset controller */
> 	azx_reset(chip);
>@@ -814,28 +859,71 @@ static void azx_init_chip(struct azx *chip)
> 	azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr);
> 	azx_writel(chip, DPUBASE, upper_32bit(chip->posbuf.addr));
> 
>+	chip->initialized = 1;
>+}
>+
>+/*
>+ * initialize the PCI registers
>+ */
>+/* update bits in a PCI register byte */
>+static void update_pci_byte(struct pci_dev *pci, unsigned int reg,
>+			    unsigned char mask, unsigned char val)
>+{
>+	unsigned char data;
>+
>+	pci_read_config_byte(pci, reg, &data);
>+	data &= ~mask;
>+	data |= (val & mask);
>+	pci_write_config_byte(pci, reg, data);
>+}
>+
>+static void azx_init_pci(struct azx *chip)
>+{
>+	unsigned short snoop;
>+
>+	/* 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
>+	 */
>+	update_pci_byte(chip->pci, ICH6_PCIREG_TCSEL, 0x07, 0);
>+
> 	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);
>+		update_pci_byte(chip->pci,
>+				ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
>+				0x07, 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);
>+		update_pci_byte(chip->pci,
>+				NVIDIA_HDA_TRANSREG_ADDR,
>+				0x0f, NVIDIA_HDA_ENABLE_COHBITS);
> 		break;
>+	case AZX_DRIVER_SCH:
>+		pci_read_config_word(chip->pci, INTEL_SCH_HDA_DEVC, &snoop);
>+		if (snoop & INTEL_SCH_HDA_DEVC_NOSNOOP) {
>+			pci_write_config_word(chip->pci, INTEL_SCH_HDA_DEVC, \
>+				snoop & (~INTEL_SCH_HDA_DEVC_NOSNOOP));
>+			pci_read_config_word(chip->pci,
>+				INTEL_SCH_HDA_DEVC, &snoop);
>+			snd_printdd("HDA snoop disabled, enabling ... %s\n",\
>+				(snoop & INTEL_SCH_HDA_DEVC_NOSNOOP) \
>+				? "Failed" : "OK");
>+		}
>+		break;
>+
>         }
> }
> 
> 
>+static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev);
>+
> /*
>  * interrupt handler
>  */
>-static irqreturn_t azx_interrupt(int irq, void* dev_id, struct pt_regs *regs)
>+static irqreturn_t azx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
> {
> 	struct azx *chip = dev_id;
> 	struct azx_dev *azx_dev;
>@@ -854,11 +942,18 @@ static irqreturn_t azx_interrupt(int irq, void* dev_id, struct pt_regs *regs)
> 		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_intr++;
>+			if (!azx_dev->substream || !azx_dev->running)
>+				continue;
>+			/* check whether this IRQ is really acceptable */
>+			if (azx_position_ok(chip, azx_dev)) {
>+				azx_dev->irq_pending = 0;
> 				spin_unlock(&chip->reg_lock);
> 				snd_pcm_period_elapsed(azx_dev->substream);
> 				spin_lock(&chip->reg_lock);
>+			} else {
>+				/* bogus IRQ, process it later */
>+				azx_dev->irq_pending = 1;
>+				schedule_work(&chip->irq_pending_work);
> 			}
> 		}
> 	}
>@@ -866,7 +961,7 @@ static irqreturn_t azx_interrupt(int irq, void* dev_id, struct pt_regs *regs)
> 	/* clear rirb int */
> 	status = azx_readb(chip, RIRBSTS);
> 	if (status & RIRB_INT_MASK) {
>-		if (! chip->single_cmd && (status & RIRB_INT_RESPONSE))
>+		if (!chip->single_cmd && (status & RIRB_INT_RESPONSE))
> 			azx_update_rirb(chip);
> 		azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);
> 	}
>@@ -885,30 +980,58 @@ static irqreturn_t azx_interrupt(int irq, void* dev_id, struct pt_regs *regs)
> /*
>  * set up BDL entries
>  */
>-static void azx_setup_periods(struct azx_dev *azx_dev)
>+static int azx_setup_periods(struct snd_pcm_substream *substream,
>+			     struct azx_dev *azx_dev)
> {
>-	u32 *bdl = azx_dev->bdl;
>-	dma_addr_t dma_addr = azx_dev->substream->runtime->dma_addr;
>-	int idx;
>+	struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
>+	u32 *bdl;
>+	int i, ofs, periods, period_bytes;
> 
> 	/* reset BDL address */
> 	azx_sd_writel(azx_dev, SD_BDLPL, 0);
> 	azx_sd_writel(azx_dev, SD_BDLPU, 0);
> 
>+	period_bytes = snd_pcm_lib_period_bytes(substream);
>+	azx_dev->period_bytes = period_bytes;
>+	periods = azx_dev->bufsize / period_bytes;
>+
> 	/* program the initial BDL entries */
>-	for (idx = 0; idx < azx_dev->frags; idx++) {
>-		unsigned int off = idx << 2; /* 4 dword step */
>-		dma_addr_t addr = dma_addr + idx * azx_dev->fragsize;
>-		/* program the address field of the BDL entry */
>-		bdl[off] = cpu_to_le32((u32)addr);
>-		bdl[off+1] = cpu_to_le32(upper_32bit(addr));
>-
>-		/* program the size field of the BDL entry */
>-		bdl[off+2] = cpu_to_le32(azx_dev->fragsize);
>-
>-		/* program the IOC to enable interrupt when buffer completes */
>-		bdl[off+3] = cpu_to_le32(0x01);
>+	bdl = (u32 *)azx_dev->bdl.area;
>+	ofs = 0;
>+	azx_dev->frags = 0;
>+	for (i = 0; i < periods; i++) {
>+		int size, rest;
>+		if (i >= AZX_MAX_BDL_ENTRIES) {
>+			snd_printk(KERN_ERR "Too many BDL entries: "
>+				   "buffer=%d, period=%d\n",
>+				   azx_dev->bufsize, period_bytes);
>+			/* reset */
>+			azx_sd_writel(azx_dev, SD_BDLPL, 0);
>+			azx_sd_writel(azx_dev, SD_BDLPU, 0);
>+			return -EINVAL;
>+		}
>+		rest = period_bytes;
>+		do {
>+			dma_addr_t addr = snd_pcm_sgbuf_get_addr(sgbuf, ofs);
>+			/* program the address field of the BDL entry */
>+			bdl[0] = cpu_to_le32((u32)addr);
>+			bdl[1] = cpu_to_le32(upper_32bit(addr));
>+			/* program the size field of the BDL entry */
>+			size = PAGE_SIZE - (ofs % PAGE_SIZE);
>+			if (rest < size)
>+				size = rest;
>+			bdl[2] = cpu_to_le32(size);
>+			/* program the IOC to enable interrupt
>+			 * only when the whole fragment is processed
>+			 */
>+			rest -= size;
>+			bdl[3] = rest ? 0 : cpu_to_le32(0x01);
>+			bdl += 4;
>+			azx_dev->frags++;
>+			ofs += size;
>+		} while (rest > 0);
> 	}
>+	return 0;
> }
> 
> /*
>@@ -920,9 +1043,11 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
> 	int timeout;
> 
> 	/* make sure the run bit is zero for SD */
>-	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) & ~SD_CTL_DMA_START);
>+	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &
>+		      ~SD_CTL_DMA_START);
> 	/* reset stream */
>-	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) | SD_CTL_STREAM_RESET);
>+	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) |
>+		      SD_CTL_STREAM_RESET);
> 	udelay(3);
> 	timeout = 300;
> 	while (!((val = azx_sd_readb(azx_dev, SD_CTL)) & SD_CTL_STREAM_RESET) &&
>@@ -940,7 +1065,7 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
> 
> 	/* program the stream_tag */
> 	azx_sd_writel(azx_dev, SD_CTL,
>-		      (azx_sd_readl(azx_dev, SD_CTL) & ~SD_CTL_STREAM_TAG_MASK) |
>+		      (azx_sd_readl(azx_dev, SD_CTL) & ~SD_CTL_STREAM_TAG_MASK)|
> 		      (azx_dev->stream_tag << SD_CTL_STREAM_TAG_SHIFT));
> 
> 	/* program the length of samples in cyclic buffer */
>@@ -955,16 +1080,21 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
> 
> 	/* program the BDL address */
> 	/* lower BDL address */
>-	azx_sd_writel(azx_dev, SD_BDLPL, (u32)azx_dev->bdl_addr);
>+	azx_sd_writel(azx_dev, SD_BDLPL, (u32)azx_dev->bdl.addr);
> 	/* upper BDL address */
>-	azx_sd_writel(azx_dev, SD_BDLPU, upper_32bit(azx_dev->bdl_addr));
>+	azx_sd_writel(azx_dev, SD_BDLPU, upper_32bit(azx_dev->bdl.addr));
> 
> 	/* enable the position buffer */
>-	if (! (azx_readl(chip, DPLBASE) & ICH6_DPLBASE_ENABLE))
>-		azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr | ICH6_DPLBASE_ENABLE);
>+	if (chip->position_fix == POS_FIX_POSBUF ||
>+	    chip->position_fix == POS_FIX_AUTO) {
>+		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);
>+	azx_sd_writel(azx_dev, SD_CTL,
>+		      azx_sd_readl(azx_dev, SD_CTL) | SD_INT_MASK);
> 
> 	return 0;
> }
>@@ -975,19 +1105,22 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
>  */
> 
> static unsigned int azx_max_codecs[] __devinitdata = {
>-	[AZX_DRIVER_ICH] = 3,
>+	[AZX_DRIVER_ICH] = 4,		/* Some ICH9 boards use SD3 */
>+	[AZX_DRIVER_SCH] = 3,
> 	[AZX_DRIVER_ATI] = 4,
> 	[AZX_DRIVER_ATIHDMI] = 4,
> 	[AZX_DRIVER_VIA] = 3,		/* FIXME: correct? */
> 	[AZX_DRIVER_SIS] = 3,		/* FIXME: correct? */
> 	[AZX_DRIVER_ULI] = 3,		/* FIXME: correct? */
> 	[AZX_DRIVER_NVIDIA] = 3,	/* FIXME: correct? */
>+	[AZX_DRIVER_TERA] = 1,
> };
> 
>-static int __devinit azx_codec_create(struct azx *chip, const char *model)
>+static int __devinit azx_codec_create(struct azx *chip, const char *model,
>+				      unsigned int codec_probe_mask)
> {
> 	struct hda_bus_template bus_temp;
>-	int c, codecs, err;
>+	int c, codecs, audio_codecs, err;
> 
> 	memset(&bus_temp, 0, sizeof(bus_temp));
> 	bus_temp.private_data = chip;
>@@ -995,20 +1128,38 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model)
> 	bus_temp.pci = chip->pci;
> 	bus_temp.ops.command = azx_send_cmd;
> 	bus_temp.ops.get_response = azx_get_response;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	bus_temp.ops.pm_notify = azx_power_notify;
>+#endif
> 
>-	if ((err = snd_hda_bus_new(chip->card, &bus_temp, &chip->bus)) < 0)
>+	err = snd_hda_bus_new(chip->card, &bus_temp, &chip->bus);
>+	if (err < 0)
> 		return err;
> 
>-	codecs = 0;
>-	for (c = 0; c < azx_max_codecs[chip->driver_type]; c++) {
>-		if ((chip->codec_mask & (1 << c)) & probe_mask) {
>-			err = snd_hda_codec_new(chip->bus, c, NULL);
>+	codecs = audio_codecs = 0;
>+	for (c = 0; c < AZX_MAX_CODECS; c++) {
>+		if ((chip->codec_mask & (1 << c)) & codec_probe_mask) {
>+			struct hda_codec *codec;
>+			err = snd_hda_codec_new(chip->bus, c, &codec);
> 			if (err < 0)
> 				continue;
> 			codecs++;
>+			if (codec->afg)
>+				audio_codecs++;
>+		}
>+	}
>+	if (!audio_codecs) {
>+		/* probe additional slots if no codec is found */
>+		for (; c < azx_max_codecs[chip->driver_type]; c++) {
>+			if ((chip->codec_mask & (1 << c)) & codec_probe_mask) {
>+				err = snd_hda_codec_new(chip->bus, c, NULL);
>+				if (err < 0)
>+					continue;
>+				codecs++;
>+			}
> 		}
> 	}
>-	if (! codecs) {
>+	if (!codecs) {
> 		snd_printk(KERN_ERR SFX "no codecs initialized\n");
> 		return -ENXIO;
> 	}
>@@ -1033,7 +1184,7 @@ static inline struct azx_dev *azx_assign_device(struct azx *chip, int stream)
> 		nums = chip->capture_streams;
> 	}
> 	for (i = 0; i < nums; i++, dev++)
>-		if (! chip->azx_dev[dev].opened) {
>+		if (!chip->azx_dev[dev].opened) {
> 			chip->azx_dev[dev].opened = 1;
> 			return &chip->azx_dev[dev];
> 		}
>@@ -1047,12 +1198,14 @@ static inline void azx_release_device(struct azx_dev *azx_dev)
> }
> 
> static struct snd_pcm_hardware azx_pcm_hw = {
>-	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
>+	.info =			(SNDRV_PCM_INFO_MMAP |
>+				 SNDRV_PCM_INFO_INTERLEAVED |
> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
> 				 SNDRV_PCM_INFO_MMAP_VALID |
> 				 /* No full-resume yet implemented */
> 				 /* SNDRV_PCM_INFO_RESUME |*/
>-				 SNDRV_PCM_INFO_PAUSE),
>+				 SNDRV_PCM_INFO_PAUSE |
>+				 SNDRV_PCM_INFO_SYNC_START),
> 	.formats =		SNDRV_PCM_FMTBIT_S16_LE,
> 	.rates =		SNDRV_PCM_RATE_48000,
> 	.rate_min =		48000,
>@@ -1100,8 +1253,11 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
> 				   128);
> 	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
> 				   128);
>-	if ((err = hinfo->ops.open(hinfo, apcm->codec, substream)) < 0) {
>+	snd_hda_power_up(apcm->codec);
>+	err = hinfo->ops.open(hinfo, apcm->codec, substream);
>+	if (err < 0) {
> 		azx_release_device(azx_dev);
>+		snd_hda_power_down(apcm->codec);
> 		mutex_unlock(&chip->open_mutex);
> 		return err;
> 	}
>@@ -1111,6 +1267,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
> 	spin_unlock_irqrestore(&chip->reg_lock, flags);
> 
> 	runtime->private_data = azx_dev;
>+	snd_pcm_set_sync(substream);
> 	mutex_unlock(&chip->open_mutex);
> 	return 0;
> }
>@@ -1130,13 +1287,16 @@ static int azx_pcm_close(struct snd_pcm_substream *substream)
> 	spin_unlock_irqrestore(&chip->reg_lock, flags);
> 	azx_release_device(azx_dev);
> 	hinfo->ops.close(hinfo, apcm->codec, substream);
>+	snd_hda_power_down(apcm->codec);
> 	mutex_unlock(&chip->open_mutex);
> 	return 0;
> }
> 
>-static int azx_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *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));
>+	return snd_pcm_lib_malloc_pages(substream,
>+					params_buffer_bytes(hw_params));
> }
> 
> static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
>@@ -1164,21 +1324,21 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
> 	struct snd_pcm_runtime *runtime = substream->runtime;
> 
> 	azx_dev->bufsize = snd_pcm_lib_buffer_bytes(substream);
>-	azx_dev->fragsize = snd_pcm_lib_period_bytes(substream);
>-	azx_dev->frags = azx_dev->bufsize / azx_dev->fragsize;
> 	azx_dev->format_val = snd_hda_calc_stream_format(runtime->rate,
> 							 runtime->channels,
> 							 runtime->format,
> 							 hinfo->maxbps);
>-	if (! azx_dev->format_val) {
>-		snd_printk(KERN_ERR SFX "invalid format_val, rate=%d, ch=%d, format=%d\n",
>+	if (!azx_dev->format_val) {
>+		snd_printk(KERN_ERR SFX
>+			   "invalid format_val, rate=%d, ch=%d, format=%d\n",
> 			   runtime->rate, runtime->channels, runtime->format);
> 		return -EINVAL;
> 	}
> 
>-	snd_printdd("azx_pcm_prepare: bufsize=0x%x, fragsize=0x%x, format=0x%x\n",
>-		    azx_dev->bufsize, azx_dev->fragsize, azx_dev->format_val);
>-	azx_setup_periods(azx_dev);
>+	snd_printdd("azx_pcm_prepare: bufsize=0x%x, format=0x%x\n",
>+		    azx_dev->bufsize, azx_dev->format_val);
>+	if (azx_setup_periods(substream, azx_dev) < 0)
>+		return -EINVAL;
> 	azx_setup_controller(chip, azx_dev);
> 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
> 		azx_dev->fifo_size = azx_sd_readw(azx_dev, SD_FIFOSIZE) + 1;
>@@ -1192,59 +1352,106 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
> static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
> {
> 	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
>-	struct azx_dev *azx_dev = get_azx_dev(substream);
> 	struct azx *chip = apcm->chip;
>-	int err = 0;
>+	struct azx_dev *azx_dev;
>+	struct snd_pcm_substream *s;
>+	int start, nsync = 0, sbits = 0;
>+	int nwait, timeout;
> 
>-	spin_lock(&chip->reg_lock);
> 	switch (cmd) {
> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
> 	case SNDRV_PCM_TRIGGER_RESUME:
> 	case SNDRV_PCM_TRIGGER_START:
>-		azx_stream_start(chip, azx_dev);
>-		azx_dev->running = 1;
>+		start = 1;
> 		break;
> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
> 	case SNDRV_PCM_TRIGGER_SUSPEND:
> 	case SNDRV_PCM_TRIGGER_STOP:
>-		azx_stream_stop(chip, azx_dev);
>-		azx_dev->running = 0;
>+		start = 0;
> 		break;
> 	default:
>-		err = -EINVAL;
>+		return -EINVAL;
>+	}
>+
>+	snd_pcm_group_for_each_entry(s, substream) {
>+		if (s->pcm->card != substream->pcm->card)
>+			continue;
>+		azx_dev = get_azx_dev(s);
>+		sbits |= 1 << azx_dev->index;
>+		nsync++;
>+		snd_pcm_trigger_done(s, substream);
>+	}
>+
>+	spin_lock(&chip->reg_lock);
>+	if (nsync > 1) {
>+		/* first, set SYNC bits of corresponding streams */
>+		azx_writel(chip, SYNC, azx_readl(chip, SYNC) | sbits);
>+	}
>+	snd_pcm_group_for_each_entry(s, substream) {
>+		if (s->pcm->card != substream->pcm->card)
>+			continue;
>+		azx_dev = get_azx_dev(s);
>+		if (start)
>+			azx_stream_start(chip, azx_dev);
>+		else
>+			azx_stream_stop(chip, azx_dev);
>+		azx_dev->running = start;
> 	}
> 	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;
>-		while (azx_sd_readb(azx_dev, SD_CTL) & SD_CTL_DMA_START && --timeout)
>-			;
>+	if (start) {
>+		if (nsync == 1)
>+			return 0;
>+		/* wait until all FIFOs get ready */
>+		for (timeout = 5000; timeout; timeout--) {
>+			nwait = 0;
>+			snd_pcm_group_for_each_entry(s, substream) {
>+				if (s->pcm->card != substream->pcm->card)
>+					continue;
>+				azx_dev = get_azx_dev(s);
>+				if (!(azx_sd_readb(azx_dev, SD_STS) &
>+				      SD_STS_FIFO_READY))
>+					nwait++;
>+			}
>+			if (!nwait)
>+				break;
>+			cpu_relax();
>+		}
>+	} else {
>+		/* wait until all RUN bits are cleared */
>+		for (timeout = 5000; timeout; timeout--) {
>+			nwait = 0;
>+			snd_pcm_group_for_each_entry(s, substream) {
>+				if (s->pcm->card != substream->pcm->card)
>+					continue;
>+				azx_dev = get_azx_dev(s);
>+				if (azx_sd_readb(azx_dev, SD_CTL) &
>+				    SD_CTL_DMA_START)
>+					nwait++;
>+			}
>+			if (!nwait)
>+				break;
>+			cpu_relax();
>+		}
> 	}
>-	return err;
>+	if (nsync > 1) {
>+		spin_lock(&chip->reg_lock);
>+		/* reset SYNC bits */
>+		azx_writel(chip, SYNC, azx_readl(chip, SYNC) & ~sbits);
>+		spin_unlock(&chip->reg_lock);
>+	}
>+	return 0;
> }
> 
>-static snd_pcm_uframes_t azx_pcm_pointer(struct snd_pcm_substream *substream)
>+static unsigned int azx_get_position(struct azx *chip,
>+				     struct azx_dev *azx_dev)
> {
>-	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 ||
> 	    chip->position_fix == POS_FIX_AUTO) {
> 		/* use the position buffer */
> 		pos = le32_to_cpu(*azx_dev->posbuf);
>-		if (chip->position_fix == POS_FIX_AUTO &&
>-		    azx_dev->period_intr == 1 && ! pos) {
>-			printk(KERN_WARNING
>-			       "hda-intel: Invalid position buffer, "
>-			       "using LPIB read method instead.\n");
>-			chip->position_fix = POS_FIX_NONE;
>-			goto read_lpib;
>-		}
> 	} else {
>-	read_lpib:
> 		/* read LPIB */
> 		pos = azx_sd_readl(azx_dev, SD_LPIB);
> 		if (chip->position_fix == POS_FIX_FIFO)
>@@ -1252,7 +1459,91 @@ static snd_pcm_uframes_t azx_pcm_pointer(struct snd_pcm_substream *substream)
> 	}
> 	if (pos >= azx_dev->bufsize)
> 		pos = 0;
>-	return bytes_to_frames(substream->runtime, pos);
>+	return pos;
>+}
>+
>+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);
>+	return bytes_to_frames(substream->runtime,
>+			       azx_get_position(chip, azx_dev));
>+}
>+
>+/*
>+ * Check whether the current DMA position is acceptable for updating
>+ * periods.  Returns non-zero if it's OK.
>+ *
>+ * Many HD-audio controllers appear pretty inaccurate about
>+ * the update-IRQ timing.  The IRQ is issued before actually the
>+ * data is processed.  So, we need to process it afterwords in a
>+ * workqueue.
>+ */
>+static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
>+{
>+	unsigned int pos;
>+
>+	pos = azx_get_position(chip, azx_dev);
>+	if (chip->position_fix == POS_FIX_AUTO) {
>+		if (!pos) {
>+			printk(KERN_WARNING
>+			       "hda-intel: Invalid position buffer, "
>+			       "using LPIB read method instead.\n");
>+			chip->position_fix = POS_FIX_NONE;
>+			pos = azx_get_position(chip, azx_dev);
>+		} else
>+			chip->position_fix = POS_FIX_POSBUF;
>+	}
>+
>+	if (pos % azx_dev->period_bytes > azx_dev->period_bytes / 2)
>+		return 0; /* NG - it's below the period boundary */
>+	return 1; /* OK, it's fine */
>+}
>+
>+/*
>+ * The work for pending PCM period updates.
>+ */
>+static void azx_irq_pending_work(void *data)
>+{
>+	struct work_struct *work = data;
>+	struct azx *chip = container_of(work, struct azx, irq_pending_work);
>+	int i, pending;
>+
>+	for (;;) {
>+		pending = 0;
>+		spin_lock_irq(&chip->reg_lock);
>+		for (i = 0; i < chip->num_streams; i++) {
>+			struct azx_dev *azx_dev = &chip->azx_dev[i];
>+			if (!azx_dev->irq_pending ||
>+			    !azx_dev->substream ||
>+			    !azx_dev->running)
>+				continue;
>+			if (azx_position_ok(chip, azx_dev)) {
>+				azx_dev->irq_pending = 0;
>+				spin_unlock(&chip->reg_lock);
>+				snd_pcm_period_elapsed(azx_dev->substream);
>+				spin_lock(&chip->reg_lock);
>+			} else
>+				pending++;
>+		}
>+		spin_unlock_irq(&chip->reg_lock);
>+		if (!pending)
>+			return;
>+		cond_resched();
>+	}
>+}
>+
>+/* clear irq_pending flags and assure no on-going workq */
>+static void azx_clear_irq_pending(struct azx *chip)
>+{
>+	int i;
>+
>+	spin_lock_irq(&chip->reg_lock);
>+	for (i = 0; i < chip->num_streams; i++)
>+		chip->azx_dev[i].irq_pending = 0;
>+	spin_unlock_irq(&chip->reg_lock);
>+	flush_scheduled_work();
> }
> 
> static struct snd_pcm_ops azx_pcm_ops = {
>@@ -1264,6 +1555,7 @@ static struct snd_pcm_ops azx_pcm_ops = {
> 	.prepare = azx_pcm_prepare,
> 	.trigger = azx_pcm_trigger,
> 	.pointer = azx_pcm_pointer,
>+	.page = snd_pcm_sgbuf_ops_page,
> };
> 
> static void azx_pcm_free(struct snd_pcm *pcm)
>@@ -1272,7 +1564,7 @@ static void azx_pcm_free(struct snd_pcm *pcm)
> }
> 
> static int __devinit create_codec_pcm(struct azx *chip, struct hda_codec *codec,
>-				      struct hda_pcm *cpcm, int pcm_dev)
>+				      struct hda_pcm *cpcm)
> {
> 	int err;
> 	struct snd_pcm *pcm;
>@@ -1286,8 +1578,9 @@ static int __devinit create_codec_pcm(struct azx *chip, struct hda_codec *codec,
> 
> 	snd_assert(cpcm->name, return -EINVAL);
> 
>-	err = snd_pcm_new(chip->card, cpcm->name, pcm_dev,
>-			  cpcm->stream[0].substreams, cpcm->stream[1].substreams,
>+	err = snd_pcm_new(chip->card, cpcm->name, cpcm->device,
>+			  cpcm->stream[0].substreams,
>+			  cpcm->stream[1].substreams,
> 			  &pcm);
> 	if (err < 0)
> 		return err;
>@@ -1305,60 +1598,70 @@ static int __devinit create_codec_pcm(struct azx *chip, struct hda_codec *codec,
> 		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &azx_pcm_ops);
> 	if (cpcm->stream[1].substreams)
> 		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &azx_pcm_ops);
>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
>+	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
> 					      snd_dma_pci_data(chip->pci),
> 					      1024 * 64, 1024 * 1024);
>-	chip->pcm[pcm_dev] = pcm;
>-	if (chip->pcm_devs < pcm_dev + 1)
>-		chip->pcm_devs = pcm_dev + 1;
>-
>+	chip->pcm[cpcm->device] = pcm;
> 	return 0;
> }
> 
> static int __devinit azx_pcm_create(struct azx *chip)
> {
>-	struct list_head *p;
>+	static const char *dev_name[HDA_PCM_NTYPES] = {
>+		"Audio", "SPDIF", "HDMI", "Modem"
>+	};
>+	/* starting device index for each PCM type */
>+	static int dev_idx[HDA_PCM_NTYPES] = {
>+		[HDA_PCM_TYPE_AUDIO] = 0,
>+		[HDA_PCM_TYPE_SPDIF] = 1,
>+		[HDA_PCM_TYPE_HDMI] = 3,
>+		[HDA_PCM_TYPE_MODEM] = 6
>+	};
>+	/* normal audio device indices; not linear to keep compatibility */
>+	static int audio_idx[4] = { 0, 2, 4, 5 };
> 	struct hda_codec *codec;
> 	int c, err;
>-	int pcm_dev;
>+	int num_devs[HDA_PCM_NTYPES];
> 
>-	if ((err = snd_hda_build_pcms(chip->bus)) < 0)
>+	err = snd_hda_build_pcms(chip->bus);
>+	if (err < 0)
> 		return err;
> 
> 	/* create audio PCMs */
>-	pcm_dev = 0;
>-	list_for_each(p, &chip->bus->codec_list) {
>-		codec = list_entry(p, struct hda_codec, list);
>+	memset(num_devs, 0, sizeof(num_devs));
>+	list_for_each_entry(codec, &chip->bus->codec_list, list) {
> 		for (c = 0; c < codec->num_pcms; c++) {
>-			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;
>-			}
>-			err = create_codec_pcm(chip, codec, &codec->pcm_info[c], pcm_dev);
>-			if (err < 0)
>-				return err;
>-			pcm_dev++;
>-		}
>-	}
>-
>-	/* 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;
>+			struct hda_pcm *cpcm = &codec->pcm_info[c];
>+			int type = cpcm->pcm_type;
>+			switch (type) {
>+			case HDA_PCM_TYPE_AUDIO:
>+				if (num_devs[type] >= ARRAY_SIZE(audio_idx)) {
>+					snd_printk(KERN_WARNING
>+						   "Too many audio devices\n");
>+					continue;
>+				}
>+				cpcm->device = audio_idx[num_devs[type]];
>+				break;
>+			case HDA_PCM_TYPE_SPDIF:
>+			case HDA_PCM_TYPE_HDMI:
>+			case HDA_PCM_TYPE_MODEM:
>+				if (num_devs[type]) {
>+					snd_printk(KERN_WARNING
>+						   "%s already defined\n",
>+						   dev_name[type]);
>+					continue;
>+				}
>+				cpcm->device = dev_idx[type];
>+				break;
>+			default:
>+				snd_printk(KERN_WARNING
>+					   "Invalid PCM type %d\n", type);
>+				continue;
> 			}
>-			err = create_codec_pcm(chip, codec, &codec->pcm_info[c], pcm_dev);
>+			num_devs[type]++;
>+			err = create_codec_pcm(chip, codec, cpcm);
> 			if (err < 0)
> 				return err;
>-			chip->pcm[pcm_dev]->dev_class = SNDRV_PCM_CLASS_MODEM;
>-			pcm_dev++;
> 		}
> 	}
> 	return 0;
>@@ -1381,13 +1684,11 @@ static int __devinit azx_init_stream(struct azx *chip)
> 	int i;
> 
> 	/* initialize each stream (aka device)
>-	 * assign the starting bdl address to each stream (device) and initialize
>+	 * assign the starting bdl address to each stream (device)
>+	 * and initialize
> 	 */
> 	for (i = 0; i < chip->num_streams; i++) {
>-		unsigned int off = sizeof(u32) * (i * AZX_MAX_FRAG * 4);
> 		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;
> 		azx_dev->posbuf = (u32 __iomem *)(chip->posbuf.area + i * 8);
> 		/* offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */
> 		azx_dev->sd_addr = chip->remap_addr + (0x20 * i + 0x80);
>@@ -1418,6 +1719,46 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect)
> }
> 
> 
>+static void azx_stop_chip(struct azx *chip)
>+{
>+	if (!chip->initialized)
>+		return;
>+
>+	/* disable interrupts */
>+	azx_int_disable(chip);
>+	azx_int_clear(chip);
>+
>+	/* disable CORB/RIRB */
>+	azx_free_cmd_io(chip);
>+
>+	/* disable position buffer */
>+	azx_writel(chip, DPLBASE, 0);
>+	azx_writel(chip, DPUBASE, 0);
>+
>+	chip->initialized = 0;
>+}
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+/* power-up/down the controller */
>+static void azx_power_notify(struct hda_codec *codec)
>+{
>+	struct azx *chip = codec->bus->private_data;
>+	struct hda_codec *c;
>+	int power_on = 0;
>+
>+	list_for_each_entry(c, &codec->bus->codec_list, list) {
>+		if (c->power_on) {
>+			power_on = 1;
>+			break;
>+		}
>+	}
>+	if (power_on)
>+		azx_init_chip(chip);
>+	else if (chip->running && power_save_controller)
>+		azx_stop_chip(chip);
>+}
>+#endif /* CONFIG_SND_HDA_POWER_SAVE */
>+
> #ifdef CONFIG_PM
> /*
>  * power management
>@@ -1429,12 +1770,13 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
> 	int i;
> 
> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
>-	for (i = 0; i < chip->pcm_devs; i++)
>+	azx_clear_irq_pending(chip);
>+	for (i = 0; i < AZX_MAX_PCMS; i++)
> 		snd_pcm_suspend_all(chip->pcm[i]);
>-	snd_hda_suspend(chip->bus, state);
>-	azx_free_cmd_io(chip);
>+	if (chip->initialized)
>+		snd_hda_suspend(chip->bus, state);
>+	azx_stop_chip(chip);
> 	if (chip->irq >= 0) {
>-		synchronize_irq(chip->irq);
> 		free_irq(chip->irq, chip);
> 		chip->irq = -1;
> 	}
>@@ -1465,7 +1807,11 @@ static int azx_resume(struct pci_dev *pci)
> 			chip->msi = 0;
> 	if (azx_acquire_irq(chip, 1) < 0)
> 		return -EIO;
>-	azx_init_chip(chip);
>+	azx_init_pci(chip);
>+
>+	if (snd_hda_codecs_inuse(chip->bus))
>+		azx_init_chip(chip);
>+
> 	snd_hda_resume(chip->bus);
> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);
> 	return 0;
>@@ -1478,35 +1824,27 @@ static int azx_resume(struct pci_dev *pci)
>  */
> static int azx_free(struct azx *chip)
> {
>-	if (chip->initialized) {
>-		int i;
>+	int i;
> 
>+	if (chip->initialized) {
>+		azx_clear_irq_pending(chip);
> 		for (i = 0; i < chip->num_streams; i++)
> 			azx_stream_stop(chip, &chip->azx_dev[i]);
>-
>-		/* disable interrupts */
>-		azx_int_disable(chip);
>-		azx_int_clear(chip);
>-
>-		/* disable CORB/RIRB */
>-		azx_free_cmd_io(chip);
>-
>-		/* disable position buffer */
>-		azx_writel(chip, DPLBASE, 0);
>-		azx_writel(chip, DPUBASE, 0);
>+		azx_stop_chip(chip);
> 	}
> 
>-	if (chip->irq >= 0) {
>-		synchronize_irq(chip->irq);
>+	if (chip->irq >= 0)
> 		free_irq(chip->irq, (void*)chip);
>-	}
> 	if (chip->msi)
> 		pci_disable_msi(chip->pci);
> 	if (chip->remap_addr)
> 		iounmap(chip->remap_addr);
> 
>-	if (chip->bdl.area)
>-		snd_dma_free_pages(&chip->bdl);
>+	if (chip->azx_dev) {
>+		for (i = 0; i < chip->num_streams; i++)
>+			if (chip->azx_dev[i].bdl.area)
>+				snd_dma_free_pages(&chip->azx_dev[i].bdl);
>+	}
> 	if (chip->rb.area)
> 		snd_dma_free_pages(&chip->rb);
> 	if (chip->posbuf.area)
>@@ -1527,8 +1865,10 @@ static int azx_dev_free(struct snd_device *device)
> /*
>  * white/black-listing for position_fix
>  */
>-static const struct snd_pci_quirk position_fix_list[] __devinitdata = {
>+static struct snd_pci_quirk position_fix_list[] __devinitdata = {
> 	SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_NONE),
>+	SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_NONE),
>+	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_NONE),
> 	{}
> };
> 
>@@ -1539,7 +1879,7 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
> 	if (fix == POS_FIX_AUTO) {
> 		q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
> 		if (q) {
>-			snd_printdd(KERN_INFO
>+			printk(KERN_INFO
> 				    "hda_intel: position_fix set to %d "
> 				    "for device %04x:%04x\n",
> 				    q->value, q->subvendor, q->subdevice);
>@@ -1550,20 +1890,51 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
> }
> 
> /*
>+ * black-lists for probe_mask
>+ */
>+static struct snd_pci_quirk probe_mask_list[] __devinitdata = {
>+	/* Thinkpad often breaks the controller communication when accessing
>+	 * to the non-working (or non-existing) modem codec slot.
>+	 */
>+	SND_PCI_QUIRK(0x1014, 0x05b7, "Thinkpad Z60", 0x01),
>+	SND_PCI_QUIRK(0x17aa, 0x2010, "Thinkpad X/T/R60", 0x01),
>+	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X/T/R61", 0x01),
>+	{}
>+};
>+
>+static void __devinit check_probe_mask(struct azx *chip, int dev)
>+{
>+	const struct snd_pci_quirk *q;
>+
>+	if (probe_mask[dev] == -1) {
>+		q = snd_pci_quirk_lookup(chip->pci, probe_mask_list);
>+		if (q) {
>+			printk(KERN_INFO
>+			       "hda_intel: probe_mask set to 0x%x "
>+			       "for device %04x:%04x\n",
>+			       q->value, q->subvendor, q->subdevice);
>+			probe_mask[dev] = q->value;
>+		}
>+	}
>+}
>+
>+
>+/*
>  * constructor
>  */
> static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
>-				int driver_type,
>+				int dev, int driver_type,
> 				struct azx **rchip)
> {
> 	struct azx *chip;
>-	int err;
>+	int i, err;
>+	unsigned short gcap;
> 	static struct snd_device_ops ops = {
> 		.dev_free = azx_dev_free,
> 	};
> 
> 	*rchip = NULL;
>-	
>+
> 	err = pci_enable_device(pci);
> 	if (err < 0)
> 		return err;
>@@ -1582,8 +1953,10 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
> 	chip->irq = -1;
> 	chip->driver_type = driver_type;
> 	chip->msi = enable_msi;
>+	INIT_WORK(&chip->irq_pending_work, azx_irq_pending_work, &chip->irq_pending_work);
> 
>-	chip->position_fix = check_position_fix(chip, position_fix);
>+	chip->position_fix = check_position_fix(chip, position_fix[dev]);
>+	check_probe_mask(chip, dev);
> 
> 	chip->single_cmd = single_cmd;
> 
>@@ -1624,58 +1997,78 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
> 	pci_set_master(pci);
> 	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;
>-	case AZX_DRIVER_ATIHDMI:
>-		chip->playback_streams = ATIHDMI_NUM_PLAYBACK;
>-		chip->capture_streams = ATIHDMI_NUM_CAPTURE;
>-		chip->playback_index_offset = ATIHDMI_PLAYBACK_INDEX;
>-		chip->capture_index_offset = ATIHDMI_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;
>+	gcap = azx_readw(chip, GCAP);
>+	snd_printdd("chipset global capabilities = 0x%x\n", gcap);
>+
>+	/* allow 64bit DMA address if supported by H/W */
>+	if ((gcap & 0x01) && !pci_set_dma_mask(pci, DMA_64BIT_MASK))
>+		pci_set_consistent_dma_mask(pci, DMA_64BIT_MASK);
>+
>+	/* read number of streams from GCAP register instead of using
>+	 * hardcoded value
>+	 */
>+	chip->capture_streams = (gcap >> 8) & 0x0f;
>+	chip->playback_streams = (gcap >> 12) & 0x0f;
>+	if (!chip->playback_streams && !chip->capture_streams) {
>+		/* gcap didn't give any info, switching to old method */
>+
>+		switch (chip->driver_type) {
>+		case AZX_DRIVER_ULI:
>+			chip->playback_streams = ULI_NUM_PLAYBACK;
>+			chip->capture_streams = ULI_NUM_CAPTURE;
>+			break;
>+		case AZX_DRIVER_ATIHDMI:
>+			chip->playback_streams = ATIHDMI_NUM_PLAYBACK;
>+			chip->capture_streams = ATIHDMI_NUM_CAPTURE;
>+			break;
>+		default:
>+			chip->playback_streams = ICH6_NUM_PLAYBACK;
>+			chip->capture_streams = ICH6_NUM_CAPTURE;
>+			break;
>+		}
> 	}
>+	chip->capture_index_offset = 0;
>+	chip->playback_index_offset = chip->capture_streams;
> 	chip->num_streams = chip->playback_streams + chip->capture_streams;
>-	chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev), GFP_KERNEL);
>+	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),
>-				       BDL_SIZE, &chip->bdl)) < 0) {
>-		snd_printk(KERN_ERR SFX "cannot allocate BDL\n");
>-		goto errout;
>+	for (i = 0; i < chip->num_streams; i++) {
>+		/* allocate memory for the BDL for each stream */
>+		err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
>+					  snd_dma_pci_data(chip->pci),
>+					  BDL_SIZE, &chip->azx_dev[i].bdl);
>+		if (err < 0) {
>+			snd_printk(KERN_ERR SFX "cannot allocate BDL\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) {
>+	err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
>+				  snd_dma_pci_data(chip->pci),
>+				  chip->num_streams * 8, &chip->posbuf);
>+	if (err < 0) {
> 		snd_printk(KERN_ERR SFX "cannot allocate posbuf\n");
> 		goto errout;
> 	}
> 	/* allocate CORB/RIRB */
>-	if (! chip->single_cmd)
>-		if ((err = azx_alloc_cmd_io(chip)) < 0)
>+	if (!chip->single_cmd) {
>+		err = azx_alloc_cmd_io(chip);
>+		if (err < 0)
> 			goto errout;
>+	}
> 
> 	/* initialize streams */
> 	azx_init_stream(chip);
> 
> 	/* initialize chip */
>+	azx_init_pci(chip);
> 	azx_init_chip(chip);
> 
>-	chip->initialized = 1;
>-
> 	/* codec detection */
> 	if (!chip->codec_mask) {
> 		snd_printk(KERN_ERR SFX "no codecs found!\n");
>@@ -1683,14 +2076,16 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
> 		goto errout;
> 	}
> 
>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) <0) {
>+	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
>+	if (err <0) {
> 		snd_printk(KERN_ERR SFX "Error creating device [card]!\n");
> 		goto errout;
> 	}
> 
> 	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);
>+	sprintf(card->longname, "%s at 0x%lx irq %i",
>+		card->shortname, chip->addr, chip->irq);
> 
> 	*rchip = chip;
> 	return 0;
>@@ -1700,19 +2095,41 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
> 	return err;
> }
> 
>-static int __devinit azx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
>+static void power_down_all_codecs(struct azx *chip)
> {
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	/* The codecs were powered up in snd_hda_codec_new().
>+	 * Now all initialization done, so turn them down if possible
>+	 */
>+	struct hda_codec *codec;
>+	list_for_each_entry(codec, &chip->bus->codec_list, list) {
>+		snd_hda_power_down(codec);
>+	}
>+#endif
>+}
>+
>+static int __devinit azx_probe(struct pci_dev *pci,
>+			       const struct pci_device_id *pci_id)
>+{
>+	static int dev;
> 	struct snd_card *card;
> 	struct azx *chip;
> 	int err;
> 
>-	card = snd_card_new(index, id, THIS_MODULE, 0);
>+	if (dev >= SNDRV_CARDS)
>+		return -ENODEV;
>+	if (!enable[dev]) {
>+		dev++;
>+		return -ENOENT;
>+	}
>+
>+	card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
> 	if (!card) {
> 		snd_printk(KERN_ERR SFX "Error creating card!\n");
> 		return -ENOMEM;
> 	}
> 
>-	err = azx_create(card, pci, pci_id->driver_data, &chip);
>+	err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
> 	if (err < 0) {
> 		snd_card_free(card);
> 		return err;
>@@ -1720,32 +2137,39 @@ static int __devinit azx_probe(struct pci_dev *pci, const struct pci_device_id *
> 	card->private_data = chip;
> 
> 	/* create codec instances */
>-	if ((err = azx_codec_create(chip, model)) < 0) {
>+	err = azx_codec_create(chip, model[dev], probe_mask[dev]);
>+	if (err < 0) {
> 		snd_card_free(card);
> 		return err;
> 	}
> 
> 	/* create PCM streams */
>-	if ((err = azx_pcm_create(chip)) < 0) {
>+	err = azx_pcm_create(chip);
>+	if (err < 0) {
> 		snd_card_free(card);
> 		return err;
> 	}
> 
> 	/* create mixer controls */
>-	if ((err = azx_mixer_create(chip)) < 0) {
>+	err = azx_mixer_create(chip);
>+	if (err < 0) {
> 		snd_card_free(card);
> 		return err;
> 	}
> 
> 	snd_card_set_dev(card, &pci->dev);
> 
>-	if ((err = snd_card_register(card)) < 0) {
>+	err = snd_card_register(card);
>+	if (err < 0) {
> 		snd_card_free(card);
> 		return err;
> 	}
> 
> 	pci_set_drvdata(pci, card);
>+	chip->running = 1;
>+	power_down_all_codecs(chip);
> 
>+	dev++;
> 	return err;
> }
> 
>@@ -1757,40 +2181,66 @@ static void __devexit azx_remove(struct pci_dev *pci)
> 
> /* PCI IDs */
> static struct pci_device_id azx_ids[] = {
>-	{ 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 */
>-	{ 0x8086, 0x293e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH9 */
>-	{ 0x8086, 0x293f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH9 */
>-	{ 0x8086, 0x3a3e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH10 */
>-	{ 0x8086, 0x3a6e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH10 */
>-	{ 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */
>-	{ 0x1002, 0x4383, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB600 */
>-	{ 0x1002, 0x793b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RS600 HDMI */
>-	{ 0x1002, 0x7919, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RS690 HDMI */
>-	{ 0x1002, 0x960f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RS780 HDMI */
>-	{ 0x1002, 0xaa00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI R600 HDMI */
>-	{ 0x1002, 0xaa08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RV630 HDMI */
>-	{ 0x1002, 0xaa10, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RV610 HDMI */
>-	{ 0x1002, 0xaa18, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RV670 HDMI */
>-	{ 0x1002, 0xaa20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RV635 HDMI */
>-	{ 0x1002, 0xaa28, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RV620 HDMI */
>-	{ 0x1002, 0xaa30, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RV770 HDMI */
>-	{ 0x1002, 0xaa38, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI HDMI */
>-	{ 0x1002, 0xaa40, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI HDMI */
>-	{ 0x1002, 0xaa48, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI HDMI */
>-	{ 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 MCP51 */
>-	{ 0x10de, 0x0371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP55 */
>-	{ 0x10de, 0x03e4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP61 */
>-	{ 0x10de, 0x03f0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP61 */
>-	{ 0x10de, 0x044a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP65 */
>-	{ 0x10de, 0x044b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP65 */
>-	{ 0x10de, 0x055c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP67 */
>-	{ 0x10de, 0x055d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP67 */
>+	/* ICH 6..10 */
>+	{ PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH },
>+	{ PCI_DEVICE(0x8086, 0x27d8), .driver_data = AZX_DRIVER_ICH },
>+	{ PCI_DEVICE(0x8086, 0x269a), .driver_data = AZX_DRIVER_ICH },
>+	{ PCI_DEVICE(0x8086, 0x284b), .driver_data = AZX_DRIVER_ICH },
>+	{ PCI_DEVICE(0x8086, 0x2911), .driver_data = AZX_DRIVER_ICH },
>+	{ PCI_DEVICE(0x8086, 0x293e), .driver_data = AZX_DRIVER_ICH },
>+	{ PCI_DEVICE(0x8086, 0x293f), .driver_data = AZX_DRIVER_ICH },
>+	{ PCI_DEVICE(0x8086, 0x3a3e), .driver_data = AZX_DRIVER_ICH },
>+	{ PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH },
>+	/* SCH */
>+	{ PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },
>+	/* ATI SB 450/600 */
>+	{ PCI_DEVICE(0x1002, 0x437b), .driver_data = AZX_DRIVER_ATI },
>+	{ PCI_DEVICE(0x1002, 0x4383), .driver_data = AZX_DRIVER_ATI },
>+	/* ATI HDMI */
>+	{ PCI_DEVICE(0x1002, 0x793b), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0x7919), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0x960f), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0xaa00), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0xaa08), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0xaa10), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0xaa18), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0xaa20), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0xaa28), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0xaa30), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0xaa38), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0xaa40), .driver_data = AZX_DRIVER_ATIHDMI },
>+	{ PCI_DEVICE(0x1002, 0xaa48), .driver_data = AZX_DRIVER_ATIHDMI },
>+	/* VIA VT8251/VT8237A */
>+	{ PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },
>+	/* SIS966 */
>+	{ PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },
>+	/* ULI M5461 */
>+	{ PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },
>+	/* NVIDIA MCP */
>+	{ PCI_DEVICE(0x10de, 0x026c), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0371), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x03e4), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x03f0), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x044a), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x044b), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x055c), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x055d), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0774), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0775), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0776), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0777), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x07fc), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x07fd), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0ac0), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0ac1), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0ac2), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0ac3), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0bd4), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0bd5), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0bd6), .driver_data = AZX_DRIVER_NVIDIA },
>+	{ PCI_DEVICE(0x10de, 0x0bd7), .driver_data = AZX_DRIVER_NVIDIA },
>+	/* Teradici */
>+	{ PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA },
> 	{ 0, }
> };
> MODULE_DEVICE_TABLE(pci, azx_ids);
>diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
>index 2e3b0c5..410e46f 100644
>--- a/sound/pci/hda/hda_local.h
>+++ b/sound/pci/hda/hda_local.h
>@@ -26,7 +26,8 @@
> /*
>  * 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) \
> 	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx,  \
>@@ -64,18 +65,42 @@
> #define HDA_CODEC_MUTE(xname, nid, xindex, direction) \
> 	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_tlv(struct snd_kcontrol *kcontrol, int op_flag, unsigned int size, unsigned int __user *tlv);
>-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);
>+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_tlv(struct snd_kcontrol *kcontrol, int op_flag,
>+			  unsigned int size, unsigned int __user *tlv);
>+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);
> /* lowlevel accessor with caching; use carefully */
> int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch,
> 			   int direction, int index);
> int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
> 			     int direction, int idx, int mask, int val);
>+int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid,
>+			     int dir, int idx, int mask, int val);
>+#ifdef SND_HDA_NEEDS_RESUME
>+void snd_hda_codec_resume_amp(struct hda_codec *codec);
>+#endif
>+
>+void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir,
>+			     unsigned int *tlv);
>+struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
>+					    const char *name);
>+int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
>+			unsigned int *tlv, const char **slaves);
>+
>+/* amp value bits */
>+#define HDA_AMP_MUTE	0x80
>+#define HDA_AMP_UNMUTE	0x00
>+#define HDA_AMP_VOLMASK	0x7f
> 
> /* mono switch binding multiple inputs */
> #define HDA_BIND_MUTE_MONO(xname, nid, channel, indices, direction) \
>@@ -86,10 +111,13 @@ int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
> 	  .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)
>+#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_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);
> 
> /* more generic bound controls */
> struct hda_ctl_ops {
>@@ -154,8 +182,10 @@ struct hda_input_mux {
> 	struct hda_input_mux_item items[HDA_MAX_NUM_INPUTS];
> };
> 
>-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,
>+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,
> 			  struct snd_ctl_elem_value *ucontrol, hda_nid_t nid,
> 			  unsigned int *cur_val);
> 
>@@ -167,13 +197,19 @@ struct hda_channel_mode {
> 	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 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 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);
> 
> /*
>@@ -191,17 +227,39 @@ struct hda_multi_out {
> 	hda_nid_t dig_out_nid;	/* digital out audio widget */
> 	int max_channels;	/* currently supported analog channels */
> 	int dig_out_used;	/* current usage of digital out (HDA_DIG_XXX) */
>+	int no_share_stream;	/* don't share a stream with multiple pins */
>+	int share_spdif;	/* share SPDIF pin */
>+	/* PCM information for both analog and SPDIF DACs */
>+	unsigned int analog_rates;
>+	unsigned int analog_maxbps;
>+	u64 analog_formats;
>+	unsigned int spdif_rates;
>+	unsigned int spdif_maxbps;
>+	u64 spdif_formats;
> };
> 
>-int snd_hda_multi_out_dig_open(struct hda_codec *codec, struct hda_multi_out *mout);
>-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,
>+int snd_hda_create_spdif_share_sw(struct hda_codec *codec,
>+				  struct hda_multi_out *mout);
>+int snd_hda_multi_out_dig_open(struct hda_codec *codec,
>+			       struct hda_multi_out *mout);
>+int snd_hda_multi_out_dig_close(struct hda_codec *codec,
>+				struct hda_multi_out *mout);
>+int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
>+				  struct hda_multi_out *mout,
>+				  unsigned int stream_tag,
>+				  unsigned int format,
> 				  struct snd_pcm_substream *substream);
>-int snd_hda_multi_out_analog_prepare(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,
>+				  struct snd_pcm_substream *substream,
>+				  struct hda_pcm_stream *hinfo);
>+int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
>+				     struct hda_multi_out *mout,
> 				     unsigned int stream_tag,
> 				     unsigned int format,
> 				     struct snd_pcm_substream *substream);
>-int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, struct hda_multi_out *mout);
>+int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
>+				     struct hda_multi_out *mout);
> 
> /*
>  * generic codec parser
>@@ -223,16 +281,8 @@ static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; }
> int snd_hda_check_board_config(struct hda_codec *codec, int num_configs,
> 			       const char **modelnames,
> 			       const struct snd_pci_quirk *pci_list);
>-int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew);
>-
>-/*
>- * power management
>- */
>-#ifdef CONFIG_PM
>-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);
>-#endif
>+int snd_hda_add_new_ctls(struct hda_codec *codec,
>+			 struct snd_kcontrol_new *knew);
> 
> /*
>  * unsolicited event handler
>@@ -246,7 +296,6 @@ struct hda_bus_unsolicited {
> 	unsigned int rp, wp;
> 
> 	/* workqueue */
>-	struct workqueue_struct *workq;
> 	struct work_struct work;
> 	struct hda_bus *bus;
> };
>@@ -265,27 +314,44 @@ enum {
> 	AUTO_PIN_LAST
> };
> 
>+enum {
>+	AUTO_PIN_LINE_OUT,
>+	AUTO_PIN_SPEAKER_OUT,
>+	AUTO_PIN_HP_OUT
>+};
>+
> extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST];
> 
>+#define AUTO_CFG_MAX_OUTS	5
>+
> struct auto_pin_cfg {
> 	int line_outs;
>-	hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */
>+	/* sorted in the order of Front/Surr/CLFE/Side */
>+	hda_nid_t line_out_pins[AUTO_CFG_MAX_OUTS];
> 	int speaker_outs;
>-	hda_nid_t speaker_pins[5];
>+	hda_nid_t speaker_pins[AUTO_CFG_MAX_OUTS];
> 	int hp_outs;
>-	hda_nid_t hp_pins[5];
>+	int line_out_type;	/* AUTO_PIN_XXX_OUT */
>+	hda_nid_t hp_pins[AUTO_CFG_MAX_OUTS];
> 	hda_nid_t input_pins[AUTO_PIN_LAST];
> 	hda_nid_t dig_out_pin;
> 	hda_nid_t dig_in_pin;
>+	hda_nid_t mono_out_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,
>+#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 */
>@@ -309,9 +375,40 @@ 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 0;
> 	return codec->wcaps[nid - codec->start_nid];
> }
> 
>+u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction);
>+int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,
>+			      unsigned int caps);
>+
>+/*
>+ * hwdep interface
>+ */
>+int snd_hda_create_hwdep(struct hda_codec *codec);
>+
>+/*
>+ * power-management
>+ */
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+void snd_hda_schedule_power_save(struct hda_codec *codec);
>+
>+struct hda_amp_list {
>+	hda_nid_t nid;
>+	unsigned char dir;
>+	unsigned char idx;
>+};
>+
>+struct hda_loopback_check {
>+	struct hda_amp_list *amplist;
>+	int power_on;
>+};
>+
>+int snd_hda_check_amp_list_power(struct hda_codec *codec,
>+				 struct hda_loopback_check *check,
>+				 hda_nid_t nid);
>+#endif /* CONFIG_SND_HDA_POWER_SAVE */
> 
> #endif /* __SOUND_HDA_LOCAL_H */
>diff --git a/sound/pci/hda/hda_patch.h b/sound/pci/hda/hda_patch.h
>index 9f9e9ae..2fdf235 100644
>--- a/sound/pci/hda/hda_patch.h
>+++ b/sound/pci/hda/hda_patch.h
>@@ -18,15 +18,3 @@ extern struct hda_codec_preset snd_hda_preset_atihdmi[];
> extern struct hda_codec_preset snd_hda_preset_conexant[];
> /* VIA codecs */
> extern struct hda_codec_preset snd_hda_preset_via[];
>-
>-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_si3054,
>-	snd_hda_preset_atihdmi,
>-	snd_hda_preset_conexant,
>-	snd_hda_preset_via,
>-	NULL
>-};
>diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
>index 17df4d0..aa8fade 100644
>--- a/sound/pci/hda/hda_proc.c
>+++ b/sound/pci/hda/hda_proc.c
>@@ -23,7 +23,6 @@
> 
> #include <sound/driver.h>
> #include <linux/init.h>
>-#include <linux/pci.h>
> #include <sound/core.h>
> #include "hda_codec.h"
> #include "hda_local.h"
>@@ -59,7 +58,8 @@ static void print_amp_caps(struct snd_info_buffer *buffer,
> 		snd_iprintf(buffer, "N/A\n");
> 		return;
> 	}
>-	snd_iprintf(buffer, "ofs=0x%02x, nsteps=0x%02x, stepsize=0x%02x, mute=%x\n",
>+	snd_iprintf(buffer, "ofs=0x%02x, nsteps=0x%02x, stepsize=0x%02x, "
>+		    "mute=%x\n",
> 		    caps & AC_AMPCAP_OFFSET,
> 		    (caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT,
> 		    (caps & AC_AMPCAP_STEP_SIZE) >> AC_AMPCAP_STEP_SIZE_SHIFT,
>@@ -77,11 +77,13 @@ static void print_amp_vals(struct snd_info_buffer *buffer,
> 	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,
>+			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,
>+		val = snd_hda_codec_read(codec, nid, 0,
>+					 AC_VERB_GET_AMP_GAIN_MUTE,
> 					 AC_AMP_GET_RIGHT | dir | i);
> 		snd_iprintf(buffer, "0x%02x]", val);
> 	}
>@@ -201,7 +203,8 @@ static const char *get_jack_color(u32 cfg)
> }
> 
> static void print_pin_caps(struct snd_info_buffer *buffer,
>-			   struct hda_codec *codec, hda_nid_t nid)
>+			   struct hda_codec *codec, hda_nid_t nid,
>+			   int *supports_vref)
> {
> 	static char *jack_conns[4] = { "Jack", "N/A", "Fixed", "Both" };
> 	static char *jack_types[16] = {
>@@ -211,7 +214,7 @@ static void print_pin_caps(struct snd_info_buffer *buffer,
> 		"SPDIF In", "Digitial In", "Reserved", "Other"
> 	};
> 	static char *jack_locations[4] = { "Ext", "Int", "Sep", "Oth" };
>-	unsigned int caps;
>+	unsigned int caps, val;
> 
> 	caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
> 	snd_iprintf(buffer, "  Pincap 0x08%x:", caps);
>@@ -225,7 +228,45 @@ static void print_pin_caps(struct snd_info_buffer *buffer,
> 		snd_iprintf(buffer, " EAPD");
> 	if (caps & AC_PINCAP_PRES_DETECT)
> 		snd_iprintf(buffer, " Detect");
>+	if (caps & AC_PINCAP_BALANCE)
>+		snd_iprintf(buffer, " Balanced");
>+	if (caps & AC_PINCAP_LR_SWAP)
>+		snd_iprintf(buffer, " R/L");
>+	if (caps & AC_PINCAP_TRIG_REQ)
>+		snd_iprintf(buffer, " Trigger");
>+	if (caps & AC_PINCAP_IMP_SENSE)
>+		snd_iprintf(buffer, " ImpSense");
> 	snd_iprintf(buffer, "\n");
>+	if (caps & AC_PINCAP_VREF) {
>+		unsigned int vref =
>+			(caps & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT;
>+		snd_iprintf(buffer, "    Vref caps:");
>+		if (vref & AC_PINCAP_VREF_HIZ)
>+			snd_iprintf(buffer, " HIZ");
>+		if (vref & AC_PINCAP_VREF_50)
>+			snd_iprintf(buffer, " 50");
>+		if (vref & AC_PINCAP_VREF_GRD)
>+			snd_iprintf(buffer, " GRD");
>+		if (vref & AC_PINCAP_VREF_80)
>+			snd_iprintf(buffer, " 80");
>+		if (vref & AC_PINCAP_VREF_100)
>+			snd_iprintf(buffer, " 100");
>+		snd_iprintf(buffer, "\n");
>+		*supports_vref = 1;
>+	} else
>+		*supports_vref = 0;
>+	if (caps & AC_PINCAP_EAPD) {
>+		val = snd_hda_codec_read(codec, nid, 0,
>+					 AC_VERB_GET_EAPD_BTLENABLE, 0);
>+		snd_iprintf(buffer, "  EAPD 0x%x:", val);
>+		if (val & AC_EAPDBTL_BALANCED)
>+			snd_iprintf(buffer, " BALANCED");
>+		if (val & AC_EAPDBTL_EAPD)
>+			snd_iprintf(buffer, " EAPD");
>+		if (val & AC_EAPDBTL_LR_SWAP)
>+			snd_iprintf(buffer, " R/L");
>+		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],
>@@ -235,10 +276,236 @@ static void print_pin_caps(struct snd_info_buffer *buffer,
> 	snd_iprintf(buffer, "    Conn = %s, Color = %s\n",
> 		    get_jack_connection(caps),
> 		    get_jack_color(caps));
>+	/* Default association and sequence values refer to default grouping
>+	 * of pin complexes and their sequence within the group. This is used
>+	 * for priority and resource allocation.
>+	 */
>+	snd_iprintf(buffer, "    DefAssociation = 0x%x, Sequence = 0x%x\n",
>+		    (caps & AC_DEFCFG_DEF_ASSOC) >> AC_DEFCFG_ASSOC_SHIFT,
>+		    caps & AC_DEFCFG_SEQUENCE);
>+	if (((caps & AC_DEFCFG_MISC) >> AC_DEFCFG_MISC_SHIFT) &
>+	    AC_DEFCFG_MISC_NO_PRESENCE) {
>+		/* Miscellaneous bit indicates external hardware does not
>+		 * support presence detection even if the pin complex
>+		 * indicates it is supported.
>+		 */
>+		snd_iprintf(buffer, "    Misc = NO_PRESENCE\n");
>+	}
>+}
>+
>+static void print_pin_ctls(struct snd_info_buffer *buffer,
>+			   struct hda_codec *codec, hda_nid_t nid,
>+			   int supports_vref)
>+{
>+	unsigned int pinctls;
>+
>+	pinctls = snd_hda_codec_read(codec, nid, 0,
>+				     AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
>+	snd_iprintf(buffer, "  Pin-ctls: 0x%02x:", pinctls);
>+	if (pinctls & AC_PINCTL_IN_EN)
>+		snd_iprintf(buffer, " IN");
>+	if (pinctls & AC_PINCTL_OUT_EN)
>+		snd_iprintf(buffer, " OUT");
>+	if (pinctls & AC_PINCTL_HP_EN)
>+		snd_iprintf(buffer, " HP");
>+	if (supports_vref) {
>+		int vref = pinctls & AC_PINCTL_VREFEN;
>+		switch (vref) {
>+		case AC_PINCTL_VREF_HIZ:
>+			snd_iprintf(buffer, " VREF_HIZ");
>+			break;
>+		case AC_PINCTL_VREF_50:
>+			snd_iprintf(buffer, " VREF_50");
>+			break;
>+		case AC_PINCTL_VREF_GRD:
>+			snd_iprintf(buffer, " VREF_GRD");
>+			break;
>+		case AC_PINCTL_VREF_80:
>+			snd_iprintf(buffer, " VREF_80");
>+			break;
>+		case AC_PINCTL_VREF_100:
>+			snd_iprintf(buffer, " VREF_100");
>+			break;
>+		}
>+	}
>+	snd_iprintf(buffer, "\n");
>+}
>+
>+static void print_vol_knob(struct snd_info_buffer *buffer,
>+			   struct hda_codec *codec, hda_nid_t nid)
>+{
>+	unsigned int cap = snd_hda_param_read(codec, nid,
>+					      AC_PAR_VOL_KNB_CAP);
>+	snd_iprintf(buffer, "  Volume-Knob: delta=%d, steps=%d, ",
>+		    (cap >> 7) & 1, cap & 0x7f);
>+	cap = snd_hda_codec_read(codec, nid, 0,
>+				 AC_VERB_GET_VOLUME_KNOB_CONTROL, 0);
>+	snd_iprintf(buffer, "direct=%d, val=%d\n",
>+		    (cap >> 7) & 1, cap & 0x7f);
>+}
>+
>+static void print_audio_io(struct snd_info_buffer *buffer,
>+			   struct hda_codec *codec, hda_nid_t nid,
>+			   unsigned int wid_type)
>+{
>+	int conv = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONV, 0);
>+	snd_iprintf(buffer,
>+		    "  Converter: stream=%d, channel=%d\n",
>+		    (conv & AC_CONV_STREAM) >> AC_CONV_STREAM_SHIFT,
>+		    conv & AC_CONV_CHANNEL);
>+
>+	if (wid_type == AC_WID_AUD_IN && (conv & AC_CONV_CHANNEL) == 0) {
>+		int sdi = snd_hda_codec_read(codec, nid, 0,
>+					     AC_VERB_GET_SDI_SELECT, 0);
>+		snd_iprintf(buffer, "  SDI-Select: %d\n",
>+			    sdi & AC_SDI_SELECT);
>+	}
>+}
>+
>+static void print_digital_conv(struct snd_info_buffer *buffer,
>+			       struct hda_codec *codec, hda_nid_t nid)
>+{
>+	unsigned int digi1 = snd_hda_codec_read(codec, nid, 0,
>+						AC_VERB_GET_DIGI_CONVERT_1, 0);
>+	unsigned int digi2 = snd_hda_codec_read(codec, nid, 0,
>+						AC_VERB_GET_DIGI_CONVERT_2, 0);
>+	snd_iprintf(buffer, "  Digital:");
>+	if (digi1 & AC_DIG1_ENABLE)
>+		snd_iprintf(buffer, " Enabled");
>+	if (digi1 & AC_DIG1_V)
>+		snd_iprintf(buffer, " Validity");
>+	if (digi1 & AC_DIG1_VCFG)
>+		snd_iprintf(buffer, " ValidityCfg");
>+	if (digi1 & AC_DIG1_EMPHASIS)
>+		snd_iprintf(buffer, " Preemphasis");
>+	if (digi1 & AC_DIG1_COPYRIGHT)
>+		snd_iprintf(buffer, " Copyright");
>+	if (digi1 & AC_DIG1_NONAUDIO)
>+		snd_iprintf(buffer, " Non-Audio");
>+	if (digi1 & AC_DIG1_PROFESSIONAL)
>+		snd_iprintf(buffer, " Pro");
>+	if (digi1 & AC_DIG1_LEVEL)
>+		snd_iprintf(buffer, " GenLevel");
>+	snd_iprintf(buffer, "\n");
>+	snd_iprintf(buffer, "  Digital category: 0x%x\n", digi2 & AC_DIG2_CC);
>+}
>+
>+static const char *get_pwr_state(u32 state)
>+{
>+	static const char *buf[4] = {
>+		"D0", "D1", "D2", "D3"
>+	};
>+	if (state < 4)
>+		return buf[state];
>+	return "UNKNOWN";
> }
> 
>+static void print_power_state(struct snd_info_buffer *buffer,
>+			      struct hda_codec *codec, hda_nid_t nid)
>+{
>+	int pwr = snd_hda_codec_read(codec, nid, 0,
>+				     AC_VERB_GET_POWER_STATE, 0);
>+	snd_iprintf(buffer, "  Power: setting=%s, actual=%s\n",
>+		    get_pwr_state(pwr & AC_PWRST_SETTING),
>+		    get_pwr_state((pwr & AC_PWRST_ACTUAL) >>
>+				  AC_PWRST_ACTUAL_SHIFT));
>+}
>+
>+static void print_unsol_cap(struct snd_info_buffer *buffer,
>+			      struct hda_codec *codec, hda_nid_t nid)
>+{
>+	int unsol = snd_hda_codec_read(codec, nid, 0,
>+				       AC_VERB_GET_UNSOLICITED_RESPONSE, 0);
>+	snd_iprintf(buffer,
>+		    "  Unsolicited: tag=%02x, enabled=%d\n",
>+		    unsol & AC_UNSOL_TAG,
>+		    (unsol & AC_UNSOL_ENABLED) ? 1 : 0);
>+}
> 
>-static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
>+static void print_proc_caps(struct snd_info_buffer *buffer,
>+			    struct hda_codec *codec, hda_nid_t nid)
>+{
>+	unsigned int proc_caps = snd_hda_param_read(codec, nid,
>+						    AC_PAR_PROC_CAP);
>+	snd_iprintf(buffer, "  Processing caps: benign=%d, ncoeff=%d\n",
>+		    proc_caps & AC_PCAP_BENIGN,
>+		    (proc_caps & AC_PCAP_NUM_COEF) >> AC_PCAP_NUM_COEF_SHIFT);
>+}
>+
>+static void print_conn_list(struct snd_info_buffer *buffer,
>+			    struct hda_codec *codec, hda_nid_t nid,
>+			    unsigned int wid_type, hda_nid_t *conn,
>+			    int conn_len)
>+{
>+	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);
>+	if (conn_len > 0) {
>+		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");
>+	}
>+}
>+
>+static void print_realtek_coef(struct snd_info_buffer *buffer,
>+			       struct hda_codec *codec, hda_nid_t nid)
>+{
>+	int coeff = snd_hda_codec_read(codec, nid, 0,
>+				       AC_VERB_GET_PROC_COEF, 0);
>+	snd_iprintf(buffer, "  Processing Coefficient: 0x%02x\n", coeff);
>+	coeff = snd_hda_codec_read(codec, nid, 0,
>+				   AC_VERB_GET_COEF_INDEX, 0);
>+	snd_iprintf(buffer, "  Coefficient Index: 0x%02x\n", coeff);
>+}
>+
>+static void print_gpio(struct snd_info_buffer *buffer,
>+		       struct hda_codec *codec, hda_nid_t nid)
>+{
>+	unsigned int gpio =
>+		snd_hda_param_read(codec, codec->afg, AC_PAR_GPIO_CAP);
>+	unsigned int enable, direction, wake, unsol, sticky, data;
>+	int i, max;
>+	snd_iprintf(buffer, "GPIO: io=%d, o=%d, i=%d, "
>+		    "unsolicited=%d, wake=%d\n",
>+		    gpio & AC_GPIO_IO_COUNT,
>+		    (gpio & AC_GPIO_O_COUNT) >> AC_GPIO_O_COUNT_SHIFT,
>+		    (gpio & AC_GPIO_I_COUNT) >> AC_GPIO_I_COUNT_SHIFT,
>+		    (gpio & AC_GPIO_UNSOLICITED) ? 1 : 0,
>+		    (gpio & AC_GPIO_WAKE) ? 1 : 0);
>+	max = gpio & AC_GPIO_IO_COUNT;
>+	enable = snd_hda_codec_read(codec, nid, 0,
>+				    AC_VERB_GET_GPIO_MASK, 0);
>+	direction = snd_hda_codec_read(codec, nid, 0,
>+				       AC_VERB_GET_GPIO_DIRECTION, 0);
>+	wake = snd_hda_codec_read(codec, nid, 0,
>+				  AC_VERB_GET_GPIO_WAKE_MASK, 0);
>+	unsol  = snd_hda_codec_read(codec, nid, 0,
>+				    AC_VERB_GET_GPIO_UNSOLICITED_RSP_MASK, 0);
>+	sticky = snd_hda_codec_read(codec, nid, 0,
>+				    AC_VERB_GET_GPIO_STICKY_MASK, 0);
>+	data = snd_hda_codec_read(codec, nid, 0,
>+				  AC_VERB_GET_GPIO_DATA, 0);
>+	for (i = 0; i < max; ++i)
>+		snd_iprintf(buffer,
>+			    "  IO[%d]: enable=%d, dir=%d, wake=%d, "
>+			    "sticky=%d, data=%d\n", i,
>+			    (enable & (1<<i)) ? 1 : 0,
>+			    (direction & (1<<i)) ? 1 : 0,
>+			    (wake & (1<<i)) ? 1 : 0,
>+			    (sticky & (1<<i)) ? 1 : 0,
>+			    (data & (1<<i)) ? 1 : 0);
>+	/* FIXME: add GPO and GPI pin information */
>+}
>+
>+static void print_codec_info(struct snd_info_entry *entry,
>+			     struct snd_info_buffer *buffer)
> {
> 	struct hda_codec *codec = entry->private_data;
> 	char buf[32];
>@@ -251,8 +518,15 @@ static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffe
> 	snd_iprintf(buffer, "Vendor Id: 0x%x\n", codec->vendor_id);
> 	snd_iprintf(buffer, "Subsystem Id: 0x%x\n", codec->subsystem_id);
> 	snd_iprintf(buffer, "Revision Id: 0x%x\n", codec->revision_id);
>+
>+	if (codec->mfg)
>+		snd_iprintf(buffer, "Modem Function Group: 0x%x\n", codec->mfg);
>+	else
>+		snd_iprintf(buffer, "No Modem Function Group found\n");
>+
> 	if (! codec->afg)
> 		return;
>+	snd_hda_power_up(codec);
> 	snd_iprintf(buffer, "Default PCM:\n");
> 	print_pcm_caps(buffer, codec, codec->afg);
> 	snd_iprintf(buffer, "Default Amp-In caps: ");
>@@ -263,14 +537,20 @@ static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffe
> 	nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid);
> 	if (! nid || nodes < 0) {
> 		snd_iprintf(buffer, "Invalid AFG subtree\n");
>+		snd_hda_power_down(codec);
> 		return;
> 	}
>+
>+	print_gpio(buffer, codec, codec->afg);
>+
> 	for (i = 0; i < nodes; i++, 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;
>-		int conn_len = 0; 
>+		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;
> 		hda_nid_t conn[HDA_MAX_CONNECTIONS];
>+		int conn_len = 0;
> 
> 		snd_iprintf(buffer, "Node 0x%02x [%s] wcaps 0x%x:", nid,
> 			    get_wid_type_name(wid_type), wid_caps);
>@@ -284,8 +564,18 @@ static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffe
> 			snd_iprintf(buffer, " Amp-In");
> 		if (wid_caps & AC_WCAP_OUT_AMP)
> 			snd_iprintf(buffer, " Amp-Out");
>+		if (wid_caps & AC_WCAP_STRIPE)
>+			snd_iprintf(buffer, " Stripe");
>+		if (wid_caps & AC_WCAP_LR_SWAP)
>+			snd_iprintf(buffer, " R/L");
> 		snd_iprintf(buffer, "\n");
> 
>+		/* volume knob is a special widget that always have connection
>+		 * list
>+		 */
>+		if (wid_type == AC_WID_VOL_KNB)
>+			wid_caps |= AC_WCAP_CONN_LIST;
>+
> 		if (wid_caps & AC_WCAP_CONN_LIST)
> 			conn_len = snd_hda_get_connections(codec, nid, conn,
> 							   HDA_MAX_CONNECTIONS);
>@@ -295,7 +585,8 @@ static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffe
> 			print_amp_caps(buffer, codec, nid, HDA_INPUT);
> 			snd_iprintf(buffer, "  Amp-In vals: ");
> 			print_amp_vals(buffer, codec, nid, HDA_INPUT,
>-				       wid_caps & AC_WCAP_STEREO, conn_len);
>+				       wid_caps & AC_WCAP_STEREO,
>+				       wid_type == AC_WID_PIN ? 1 : conn_len);
> 		}
> 		if (wid_caps & AC_WCAP_OUT_AMP) {
> 			snd_iprintf(buffer, "  Amp-Out caps: ");
>@@ -305,46 +596,51 @@ static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffe
> 				       wid_caps & AC_WCAP_STEREO, 1);
> 		}
> 
>-		if (wid_type == AC_WID_PIN) {
>-			unsigned int pinctls;
>-			print_pin_caps(buffer, codec, nid);
>-			pinctls = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
>-			snd_iprintf(buffer, "  Pin-ctls: 0x%02x:", pinctls);
>-			if (pinctls & AC_PINCTL_IN_EN)
>-				snd_iprintf(buffer, " IN");
>-			if (pinctls & AC_PINCTL_OUT_EN)
>-				snd_iprintf(buffer, " OUT");
>-			if (pinctls & AC_PINCTL_HP_EN)
>-				snd_iprintf(buffer, " HP");
>-			snd_iprintf(buffer, "\n");
>+		switch (wid_type) {
>+		case AC_WID_PIN: {
>+			int supports_vref;
>+			print_pin_caps(buffer, codec, nid, &supports_vref);
>+			print_pin_ctls(buffer, codec, nid, supports_vref);
>+			break;
> 		}
>-
>-		if ((wid_type == AC_WID_AUD_OUT || wid_type == AC_WID_AUD_IN) &&
>-		    (wid_caps & AC_WCAP_FORMAT_OVRD)) {
>-			snd_iprintf(buffer, "  PCM:\n");
>-			print_pcm_caps(buffer, codec, nid);
>+		case AC_WID_VOL_KNB:
>+			print_vol_knob(buffer, codec, nid);
>+			break;
>+		case AC_WID_AUD_OUT:
>+		case AC_WID_AUD_IN:
>+			print_audio_io(buffer, codec, nid, wid_type);
>+			if (wid_caps & AC_WCAP_DIGITAL)
>+				print_digital_conv(buffer, codec, nid);
>+			if (wid_caps & AC_WCAP_FORMAT_OVRD) {
>+				snd_iprintf(buffer, "  PCM:\n");
>+				print_pcm_caps(buffer, codec, nid);
>+			}
>+			break;
> 		}
> 
>+		if (wid_caps & AC_WCAP_UNSOL_CAP)
>+			print_unsol_cap(buffer, codec, nid);
>+
> 		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) {
>-			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, "\n");
>-		}
>+			print_power_state(buffer, codec, nid);
>+
>+		if (wid_caps & AC_WCAP_DELAY)
>+			snd_iprintf(buffer, "  Delay: %d samples\n",
>+				    (wid_caps & AC_WCAP_DELAY) >>
>+				    AC_WCAP_DELAY_SHIFT);
>+
>+		if (wid_caps & AC_WCAP_CONN_LIST)
>+			print_conn_list(buffer, codec, nid, wid_type,
>+					conn, conn_len);
>+
>+		if (wid_caps & AC_WCAP_PROC_WID)
>+			print_proc_caps(buffer, codec, nid);
>+
>+		/* NID 0x20 == Realtek Define Registers */
>+		if (codec->vendor_id == 0x10ec && nid == 0x20)
>+			print_realtek_coef(buffer, codec, nid);
> 	}
>+	snd_hda_power_down(codec);
> }
> 
> /*
>diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
>index 7660bc8..809a2a9 100644
>--- a/sound/pci/hda/patch_analog.c
>+++ b/sound/pci/hda/patch_analog.c
>@@ -2,7 +2,7 @@
>  * HD audio interface patch for AD1882, AD1884, AD1981HD, AD1983, AD1984,
>  *   AD1986A, AD1988
>  *
>- * Copyright (c) 2005 Takashi Iwai <tiwai@suse.de>
>+ * Copyright (c) 2005-2007 Takashi Iwai <tiwai@suse.de>
>  *
>  *  This driver is free software; you can redistribute it and/or modify
>  *  it under the terms of the GNU General Public License as published by
>@@ -29,6 +29,7 @@
> #include <sound/core.h>
> #include "hda_codec.h"
> #include "hda_local.h"
>+#include "hda_patch.h"
> 
> struct ad198x_spec {
> 	struct snd_kcontrol_new *mixers[5];
>@@ -62,7 +63,7 @@ struct ad198x_spec {
> 	int num_channel_mode;
> 
> 	/* PCM information */
>-	struct hda_pcm pcm_rec[2];	/* used in alc_build_pcms() */
>+	struct hda_pcm pcm_rec[3];	/* used in alc_build_pcms() */
> 
> 	struct mutex amp_mutex;	/* PCM volume/mute control mutex */
> 	unsigned int spdif_route;
>@@ -72,7 +73,17 @@ struct ad198x_spec {
> 	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];
>+	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
>+
>+	unsigned int jack_present :1;
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	struct hda_loopback_check loopback;
>+#endif
>+	/* for virtual master */
>+	hda_nid_t vmaster_nid;
>+	const char **slave_vols;
>+	const char **slave_sws;
> };
> 
> /*
>@@ -120,6 +131,32 @@ static int ad198x_init(struct hda_codec *codec)
> 	return 0;
> }
> 
>+static const char *ad_slave_vols[] = {
>+	"Front Playback Volume",
>+	"Surround Playback Volume",
>+	"Center Playback Volume",
>+	"LFE Playback Volume",
>+	"Side Playback Volume",
>+	"Headphone Playback Volume",
>+	"Mono Playback Volume",
>+	"Speaker Playback Volume",
>+	"IEC958 Playback Volume",
>+	NULL
>+};
>+
>+static const char *ad_slave_sws[] = {
>+	"Front Playback Switch",
>+	"Surround Playback Switch",
>+	"Center Playback Switch",
>+	"LFE Playback Switch",
>+	"Side Playback Switch",
>+	"Headphone Playback Switch",
>+	"Mono Playback Switch",
>+	"Speaker Playback Switch",
>+	"IEC958 Playback Switch",
>+	NULL
>+};
>+
> static int ad198x_build_controls(struct hda_codec *codec)
> {
> 	struct ad198x_spec *spec = codec->spec;
>@@ -135,15 +172,50 @@ static int ad198x_build_controls(struct hda_codec *codec)
> 		err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
> 		if (err < 0)
> 			return err;
>+		err = snd_hda_create_spdif_share_sw(codec,
>+						    &spec->multiout);
>+		if (err < 0)
>+			return err;
>+		spec->multiout.share_spdif = 1;
> 	} 
> 	if (spec->dig_in_nid) {
> 		err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
> 		if (err < 0)
> 			return err;
> 	}
>+
>+	/* if we have no master control, let's create it */
>+	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
>+		unsigned int vmaster_tlv[4];
>+		snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid,
>+					HDA_OUTPUT, vmaster_tlv);
>+		err = snd_hda_add_vmaster(codec, "Master Playback Volume",
>+					  vmaster_tlv,
>+					  (spec->slave_vols ?
>+					   spec->slave_vols : ad_slave_vols));
>+		if (err < 0)
>+			return err;
>+	}
>+	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {
>+		err = snd_hda_add_vmaster(codec, "Master Playback Switch",
>+					  NULL,
>+					  (spec->slave_sws ?
>+					   spec->slave_sws : ad_slave_sws));
>+		if (err < 0)
>+			return err;
>+	}
>+
> 	return 0;
> }
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static int ad198x_check_power_status(struct hda_codec *codec, hda_nid_t nid)
>+{
>+	struct ad198x_spec *spec = codec->spec;
>+	return snd_hda_check_amp_list_power(codec, &spec->loopback, nid);
>+}
>+#endif
>+
> /*
>  * Analog playback callbacks
>  */
>@@ -152,7 +224,8 @@ static int ad198x_playback_pcm_open(struct hda_pcm_stream *hinfo,
> 				    struct snd_pcm_substream *substream)
> {
> 	struct ad198x_spec *spec = codec->spec;
>-	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
>+	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
>+					     hinfo);
> }
> 
> static int ad198x_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
>@@ -193,6 +266,17 @@ static int ad198x_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
> 	return snd_hda_multi_out_dig_close(codec, &spec->multiout);
> }
> 
>+static int ad198x_dig_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 ad198x_spec *spec = codec->spec;
>+	return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
>+					     format, substream);
>+}
>+
> /*
>  * Analog capture
>  */
>@@ -213,8 +297,7 @@ static int ad198x_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
> 				      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);
>+	snd_hda_codec_cleanup_stream(codec, spec->adc_nids[substream->number]);
> 	return 0;
> }
> 
>@@ -251,7 +334,8 @@ static struct hda_pcm_stream ad198x_pcm_digital_playback = {
> 	.nid = 0, /* fill later */
> 	.ops = {
> 		.open = ad198x_dig_playback_pcm_open,
>-		.close = ad198x_dig_playback_pcm_close
>+		.close = ad198x_dig_playback_pcm_close,
>+		.prepare = ad198x_dig_playback_pcm_prepare
> 	},
> };
> 
>@@ -282,6 +366,7 @@ static int ad198x_build_pcms(struct hda_codec *codec)
> 		info++;
> 		codec->num_pcms++;
> 		info->name = "AD198x Digital";
>+		info->pcm_type = HDA_PCM_TYPE_SPDIF;
> 		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) {
>@@ -306,30 +391,13 @@ static void ad198x_free(struct hda_codec *codec)
> 	kfree(codec->spec);
> }
> 
>-#ifdef CONFIG_PM
>-static int ad198x_resume(struct hda_codec *codec)
>-{
>-	struct ad198x_spec *spec = codec->spec;
>-	int i;
>-
>-	codec->patch_ops.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,
>-#ifdef CONFIG_PM
>-	.resume = ad198x_resume,
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	.check_power_status = ad198x_check_power_status,
> #endif
> };
> 
>@@ -338,15 +406,7 @@ static struct hda_codec_ops ad198x_patch_ops = {
>  * EAPD control
>  * the private value = nid | (invert << 8)
>  */
>-static int ad198x_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;
>-}
>+#define ad198x_eapd_info	snd_ctl_boolean_mono_info
> 
> static int ad198x_eapd_get(struct snd_kcontrol *kcontrol,
> 			   struct snd_ctl_elem_value *ucontrol)
>@@ -369,15 +429,15 @@ static int ad198x_eapd_put(struct snd_kcontrol *kcontrol,
> 	int invert = (kcontrol->private_value >> 8) & 1;
> 	hda_nid_t nid = kcontrol->private_value & 0xff;
> 	unsigned int eapd;
>-	eapd = ucontrol->value.integer.value[0];
>+	eapd = !!ucontrol->value.integer.value[0];
> 	if (invert)
> 		eapd = !eapd;
>-	if (eapd == spec->cur_eapd && ! codec->in_resume)
>+	if (eapd == spec->cur_eapd)
> 		return 0;
> 	spec->cur_eapd = eapd;
>-	snd_hda_codec_write(codec, nid,
>-			    0, AC_VERB_SET_EAPD_BTLENABLE,
>-			    eapd ? 0x02 : 0x00);
>+	snd_hda_codec_write_cache(codec, nid,
>+				  0, AC_VERB_SET_EAPD_BTLENABLE,
>+				  eapd ? 0x02 : 0x00);
> 	return 1;
> }
> 
>@@ -499,13 +559,30 @@ static struct snd_kcontrol_new ad1986a_3st_mixers[] = {
> /* laptop model - 2ch only */
> static hda_nid_t ad1986a_laptop_dac_nids[1] = { AD1986A_FRONT_DAC };
> 
>+/* master controls both pins 0x1a and 0x1b */
>+static struct hda_bind_ctls ad1986a_laptop_master_vol = {
>+	.ops = &snd_hda_bind_vol,
>+	.values = {
>+		HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
>+		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
>+		0,
>+	},
>+};
>+
>+static struct hda_bind_ctls ad1986a_laptop_master_sw = {
>+	.ops = &snd_hda_bind_sw,
>+	.values = {
>+		HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
>+		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
>+		0,
>+	},
>+};
>+
> static struct snd_kcontrol_new ad1986a_laptop_mixers[] = {
> 	HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_MUTE("Master Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
>-	/* HDA_CODEC_VOLUME("Headphone Playback Volume", 0x1a, 0x0, HDA_OUTPUT),
>-	   HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x0, HDA_OUTPUT), */
>+	HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
>+	HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw),
> 	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),
>@@ -533,25 +610,6 @@ static struct snd_kcontrol_new ad1986a_laptop_mixers[] = {
> 
> /* laptop-eapd model - 2ch only */
> 
>-/* master controls both pins 0x1a and 0x1b */
>-static struct hda_bind_ctls ad1986a_laptop_master_vol = {
>-	.ops = &snd_hda_bind_vol,
>-	.values = {
>-		HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
>-		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
>-		0,
>-	},
>-};
>-
>-static struct hda_bind_ctls ad1986a_laptop_master_sw = {
>-	.ops = &snd_hda_bind_sw,
>-	.values = {
>-		HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
>-		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
>-		0,
>-	},
>-};
>-
> static struct hda_input_mux ad1986a_laptop_eapd_capture_source = {
> 	.num_items = 3,
> 	.items = {
>@@ -561,16 +619,150 @@ static struct hda_input_mux ad1986a_laptop_eapd_capture_source = {
> 	},
> };
> 
>+static struct hda_input_mux ad1986a_automic_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "Mic", 0x0 },
>+		{ "Mix", 0x5 },
>+	},
>+};
>+
> static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
> 	HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
> 	HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw),
> 	HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 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("Mic Boost", 0x0f, 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,
>+	},
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "External Amplifier",
>+		.info = ad198x_eapd_info,
>+		.get = ad198x_eapd_get,
>+		.put = ad198x_eapd_put,
>+		.private_value = 0x1b | (1 << 8), /* port-D, inversed */
>+	},
>+	{ } /* end */
>+};
>+
>+/* re-connect the mic boost input according to the jack sensing */
>+static void ad1986a_automic(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	present = snd_hda_codec_read(codec, 0x1f, 0, AC_VERB_GET_PIN_SENSE, 0);
>+	/* 0 = 0x1f, 2 = 0x1d, 4 = mixed */
>+	snd_hda_codec_write(codec, 0x0f, 0, AC_VERB_SET_CONNECT_SEL,
>+			    (present & AC_PINSENSE_PRESENCE) ? 0 : 2);
>+}
>+
>+#define AD1986A_MIC_EVENT		0x36
>+
>+static void ad1986a_automic_unsol_event(struct hda_codec *codec,
>+					    unsigned int res)
>+{
>+	if ((res >> 26) != AD1986A_MIC_EVENT)
>+		return;
>+	ad1986a_automic(codec);
>+}
>+
>+static int ad1986a_automic_init(struct hda_codec *codec)
>+{
>+	ad198x_init(codec);
>+	ad1986a_automic(codec);
>+	return 0;
>+}
>+
>+/* laptop-automute - 2ch only */
>+
>+static void ad1986a_update_hp(struct hda_codec *codec)
>+{
>+	struct ad198x_spec *spec = codec->spec;
>+	unsigned int mute;
>+
>+	if (spec->jack_present)
>+		mute = HDA_AMP_MUTE; /* mute internal speaker */
>+	else
>+		/* unmute internal speaker if necessary */
>+		mute = snd_hda_codec_amp_read(codec, 0x1a, 0, HDA_OUTPUT, 0);
>+	snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, mute);
>+}
>+
>+static void ad1986a_hp_automute(struct hda_codec *codec)
>+{
>+	struct ad198x_spec *spec = codec->spec;
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x1a, 0, AC_VERB_GET_PIN_SENSE, 0);
>+	/* Lenovo N100 seems to report the reversed bit for HP jack-sensing */
>+	spec->jack_present = !(present & 0x80000000);
>+	ad1986a_update_hp(codec);
>+}
>+
>+#define AD1986A_HP_EVENT		0x37
>+
>+static void ad1986a_hp_unsol_event(struct hda_codec *codec, unsigned int res)
>+{
>+	if ((res >> 26) != AD1986A_HP_EVENT)
>+		return;
>+	ad1986a_hp_automute(codec);
>+}
>+
>+static int ad1986a_hp_init(struct hda_codec *codec)
>+{
>+	ad198x_init(codec);
>+	ad1986a_hp_automute(codec);
>+	return 0;
>+}
>+
>+/* bind hp and internal speaker mute (with plug check) */
>+static int ad1986a_hp_master_sw_put(struct snd_kcontrol *kcontrol,
>+				    struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>+	long *valp = ucontrol->value.integer.value;
>+	int change;
>+
>+	change = snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0,
>+					  HDA_AMP_MUTE,
>+					  valp[0] ? 0 : HDA_AMP_MUTE);
>+	change |= snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0,
>+					   HDA_AMP_MUTE,
>+					   valp[1] ? 0 : HDA_AMP_MUTE);
>+	if (change)
>+		ad1986a_update_hp(codec);
>+	return change;
>+}
>+
>+static struct snd_kcontrol_new ad1986a_laptop_automute_mixers[] = {
>+	HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Master Playback Switch",
>+		.info = snd_hda_mixer_amp_switch_info,
>+		.get = snd_hda_mixer_amp_switch_get,
>+		.put = ad1986a_hp_master_sw_put,
>+		.private_value = HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
>+	},
>+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 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("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x18, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Beep Playback Switch", 0x18, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),
> 	{
>@@ -649,41 +841,35 @@ static struct hda_verb ad1986a_init_verbs[] = {
> 	{ } /* end */
> };
> 
>-/* additional verbs for 3-stack model */
>-static struct hda_verb ad1986a_3st_init_verbs[] = {
>- 	/* Mic and line-in selectors */
>-	{0x0f, AC_VERB_SET_CONNECT_SEL, 0x2},
>-	{0x10, AC_VERB_SET_CONNECT_SEL, 0x1},
>- 	{ } /* end */
>-};
>-
> static struct hda_verb ad1986a_ch2_init[] = {
> 	/* Surround out -> Line In */
>-	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
>-	{ 0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
>+	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
>+ 	/* Line-in selectors */
>+	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x1 },
> 	/* CLFE -> Mic in */
>-	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
>-	{ 0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
>+	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
>+	/* Mic selector, mix C/LFE (backmic) and Mic (frontmic) */
>+	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x4 },
> 	{ } /* end */
> };
> 
> static struct hda_verb ad1986a_ch4_init[] = {
> 	/* Surround out -> Surround */
>-	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
>-	{ 0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
>+	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 },
> 	/* CLFE -> Mic in */
>-	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
>-	{ 0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
>+	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
>+	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x4 },
> 	{ } /* end */
> };
> 
> static struct hda_verb ad1986a_ch6_init[] = {
> 	/* Surround out -> Surround out */
>-	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
>-	{ 0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
>+	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 },
> 	/* CLFE -> CLFE */
>-	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
>-	{ 0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
>+	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x0 },
> 	{ } /* end */
> };
> 
>@@ -699,6 +885,15 @@ static struct hda_verb ad1986a_eapd_init_verbs[] = {
> 	{}
> };
> 
>+static struct hda_verb ad1986a_automic_verbs[] = {
>+	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+	{0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+	/*{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},*/
>+	{0x0f, AC_VERB_SET_CONNECT_SEL, 0x0},
>+	{0x1f, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1986A_MIC_EVENT},
>+	{}
>+};
>+
> /* Ultra initialization */
> static struct hda_verb ad1986a_ultra_init[] = {
> 	/* eapd initialization */
>@@ -710,12 +905,20 @@ static struct hda_verb ad1986a_ultra_init[] = {
> 	{ } /* end */
> };
> 
>+/* pin sensing on HP jack */
>+static struct hda_verb ad1986a_hp_init_verbs[] = {
>+	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1986A_HP_EVENT},
>+	{}
>+};
>+
>+
> /* models */
> enum {
> 	AD1986A_6STACK,
> 	AD1986A_3STACK,
> 	AD1986A_LAPTOP,
> 	AD1986A_LAPTOP_EAPD,
>+	AD1986A_LAPTOP_AUTOMUTE,
> 	AD1986A_ULTRA,
> 	AD1986A_MODELS
> };
>@@ -725,38 +928,60 @@ static const char *ad1986a_models[AD1986A_MODELS] = {
> 	[AD1986A_3STACK]	= "3stack",
> 	[AD1986A_LAPTOP]	= "laptop",
> 	[AD1986A_LAPTOP_EAPD]	= "laptop-eapd",
>+	[AD1986A_LAPTOP_AUTOMUTE] = "laptop-automute",
> 	[AD1986A_ULTRA]		= "ultra",
> };
> 
> static struct snd_pci_quirk ad1986a_cfg_tbl[] = {
> 	SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_LAPTOP_EAPD),
>-	SND_PCI_QUIRK(0x10de, 0xcb84, "ASUS A8N-VM", AD1986A_3STACK),
> 	SND_PCI_QUIRK(0x1043, 0x1153, "ASUS M9", AD1986A_LAPTOP_EAPD),
>-	SND_PCI_QUIRK(0x1043, 0x1213, "ASUS A6J", AD1986A_LAPTOP_EAPD),
> 	SND_PCI_QUIRK(0x1043, 0x11f7, "ASUS U5A", AD1986A_LAPTOP_EAPD),
>+	SND_PCI_QUIRK(0x1043, 0x1213, "ASUS A6J", AD1986A_LAPTOP_EAPD),
> 	SND_PCI_QUIRK(0x1043, 0x1263, "ASUS U5F", AD1986A_LAPTOP_EAPD),
> 	SND_PCI_QUIRK(0x1043, 0x1297, "ASUS Z62F", AD1986A_LAPTOP_EAPD),
> 	SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS V1j", AD1986A_LAPTOP_EAPD),
> 	SND_PCI_QUIRK(0x1043, 0x1302, "ASUS W3j", AD1986A_LAPTOP_EAPD),
>+	SND_PCI_QUIRK(0x1043, 0x1443, "ASUS VX1", AD1986A_LAPTOP),
>+	SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8J", AD1986A_3STACK),
> 	SND_PCI_QUIRK(0x1043, 0x817f, "ASUS P5", AD1986A_3STACK),
> 	SND_PCI_QUIRK(0x1043, 0x818f, "ASUS P5", AD1986A_LAPTOP),
> 	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS P5", AD1986A_3STACK),
> 	SND_PCI_QUIRK(0x1043, 0x81cb, "ASUS M2N", AD1986A_3STACK),
> 	SND_PCI_QUIRK(0x1043, 0x8234, "ASUS M2N", AD1986A_3STACK),
>+	SND_PCI_QUIRK(0x10de, 0xcb84, "ASUS A8N-VM", AD1986A_3STACK),
>+	SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba", AD1986A_LAPTOP_EAPD),
> 	SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),
> 	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),
> 	SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_LAPTOP_EAPD),
> 	SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_LAPTOP_EAPD),
> 	SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_LAPTOP_EAPD),
>-	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
> 	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),
>+	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
> 	SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP),
> 	SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK),
>-	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_EAPD),
>+	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_AUTOMUTE),
> 	SND_PCI_QUIRK(0x17c0, 0x2017, "Samsung M50", AD1986A_LAPTOP),
> 	{}
> };
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list ad1986a_loopbacks[] = {
>+	{ 0x13, HDA_OUTPUT, 0 }, /* Mic */
>+	{ 0x14, HDA_OUTPUT, 0 }, /* Phone */
>+	{ 0x15, HDA_OUTPUT, 0 }, /* CD */
>+	{ 0x16, HDA_OUTPUT, 0 }, /* Aux */
>+	{ 0x17, HDA_OUTPUT, 0 }, /* Line */
>+	{ } /* end */
>+};
>+#endif
>+
>+static int is_jack_available(struct hda_codec *codec, hda_nid_t nid)
>+{
>+	unsigned int conf = snd_hda_codec_read(codec, nid, 0,
>+					       AC_VERB_GET_CONFIG_DEFAULT, 0);
>+	return get_defcfg_connect(conf) != AC_JACK_PORT_NONE;
>+}
>+
> static int patch_ad1986a(struct hda_codec *codec)
> {
> 	struct ad198x_spec *spec;
>@@ -780,6 +1005,10 @@ static int patch_ad1986a(struct hda_codec *codec)
> 	spec->mixers[0] = ad1986a_mixers;
> 	spec->num_init_verbs = 1;
> 	spec->init_verbs[0] = ad1986a_init_verbs;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = ad1986a_loopbacks;
>+#endif
>+	spec->vmaster_nid = 0x1b;
> 
> 	codec->patch_ops = ad198x_patch_ops;
> 
>@@ -791,9 +1020,8 @@ static int patch_ad1986a(struct hda_codec *codec)
> 	case AD1986A_3STACK:
> 		spec->num_mixers = 2;
> 		spec->mixers[1] = ad1986a_3st_mixers;
>-		spec->num_init_verbs = 3;
>-		spec->init_verbs[1] = ad1986a_3st_init_verbs;
>-		spec->init_verbs[2] = ad1986a_ch2_init;
>+		spec->num_init_verbs = 2;
>+		spec->init_verbs[1] = ad1986a_ch2_init;
> 		spec->channel_mode = ad1986a_modes;
> 		spec->num_channel_mode = ARRAY_SIZE(ad1986a_modes);
> 		spec->need_dac_fix = 1;
>@@ -808,13 +1036,31 @@ static int patch_ad1986a(struct hda_codec *codec)
> 		break;
> 	case AD1986A_LAPTOP_EAPD:
> 		spec->mixers[0] = ad1986a_laptop_eapd_mixers;
>-		spec->num_init_verbs = 2;
>+		spec->num_init_verbs = 3;
> 		spec->init_verbs[1] = ad1986a_eapd_init_verbs;
>+		spec->init_verbs[2] = ad1986a_automic_verbs;
> 		spec->multiout.max_channels = 2;
> 		spec->multiout.num_dacs = 1;
> 		spec->multiout.dac_nids = ad1986a_laptop_dac_nids;
>-		spec->multiout.dig_out_nid = 0;
>+		if (!is_jack_available(codec, 0x25))
>+			spec->multiout.dig_out_nid = 0;
>+		spec->input_mux = &ad1986a_automic_capture_source;
>+		codec->patch_ops.unsol_event = ad1986a_automic_unsol_event;
>+		codec->patch_ops.init = ad1986a_automic_init;
>+		break;
>+	case AD1986A_LAPTOP_AUTOMUTE:
>+		spec->mixers[0] = ad1986a_laptop_automute_mixers;
>+		spec->num_init_verbs = 3;
>+		spec->init_verbs[1] = ad1986a_eapd_init_verbs;
>+		spec->init_verbs[2] = ad1986a_hp_init_verbs;
>+		spec->multiout.max_channels = 2;
>+		spec->multiout.num_dacs = 1;
>+		spec->multiout.dac_nids = ad1986a_laptop_dac_nids;
>+		if (!is_jack_available(codec, 0x25))
>+			spec->multiout.dig_out_nid = 0;
> 		spec->input_mux = &ad1986a_laptop_eapd_capture_source;
>+		codec->patch_ops.unsol_event = ad1986a_hp_unsol_event;
>+		codec->patch_ops.init = ad1986a_hp_init;
> 		break;
> 	case AD1986A_ULTRA:
> 		spec->mixers[0] = ad1986a_laptop_eapd_mixers;
>@@ -827,6 +1073,14 @@ static int patch_ad1986a(struct hda_codec *codec)
> 		break;
> 	}
> 
>+	/* AD1986A has a hardware problem that it can't share a stream
>+	 * with multiple output pins.  The copy of front to surrounds
>+	 * causes noisy or silent outputs at a certain timing, e.g.
>+	 * changing the volume.
>+	 * So, let's disable the shared stream.
>+	 */
>+	spec->multiout.no_share_stream = 1;
>+
> 	return 0;
> }
> 
>@@ -882,10 +1136,13 @@ static int ad1983_spdif_route_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
> 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
> 	struct ad198x_spec *spec = codec->spec;
> 
>+	if (ucontrol->value.enumerated.item[0] > 1)
>+		return -EINVAL;
> 	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);
>+		snd_hda_codec_write_cache(codec, spec->multiout.dig_out_nid, 0,
>+					  AC_VERB_SET_CONNECT_SEL,
>+					  spec->spdif_route);
> 		return 1;
> 	}
> 	return 0;
>@@ -965,6 +1222,13 @@ static struct hda_verb ad1983_init_verbs[] = {
> 	{ } /* end */
> };
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list ad1983_loopbacks[] = {
>+	{ 0x12, HDA_OUTPUT, 0 }, /* Mic */
>+	{ 0x13, HDA_OUTPUT, 0 }, /* Line */
>+	{ } /* end */
>+};
>+#endif
> 
> static int patch_ad1983(struct hda_codec *codec)
> {
>@@ -989,6 +1253,10 @@ static int patch_ad1983(struct hda_codec *codec)
> 	spec->num_init_verbs = 1;
> 	spec->init_verbs[0] = ad1983_init_verbs;
> 	spec->spdif_route = 0;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = ad1983_loopbacks;
>+#endif
>+	spec->vmaster_nid = 0x05;
> 
> 	codec->patch_ops = ad198x_patch_ops;
> 
>@@ -1112,6 +1380,17 @@ static struct hda_verb ad1981_init_verbs[] = {
> 	{ } /* end */
> };
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list ad1981_loopbacks[] = {
>+	{ 0x12, HDA_OUTPUT, 0 }, /* Front Mic */
>+	{ 0x13, HDA_OUTPUT, 0 }, /* Line */
>+	{ 0x1b, HDA_OUTPUT, 0 }, /* Aux */
>+	{ 0x1c, HDA_OUTPUT, 0 }, /* Mic */
>+	{ 0x1d, HDA_OUTPUT, 0 }, /* CD */
>+	{ } /* end */
>+};
>+#endif
>+
> /*
>  * Patch for HP nx6320
>  *
>@@ -1139,33 +1418,26 @@ static int ad1981_hp_master_sw_put(struct snd_kcontrol *kcontrol,
> 
> 	if (! ad198x_eapd_put(kcontrol, ucontrol))
> 		return 0;
>-
>+	/* change speaker pin appropriately */
>+	snd_hda_codec_write(codec, 0x05, 0,
>+			    AC_VERB_SET_PIN_WIDGET_CONTROL,
>+			    spec->cur_eapd ? PIN_OUT : 0);
> 	/* toggle HP mute appropriately */
>-	snd_hda_codec_amp_update(codec, 0x06, 0, HDA_OUTPUT, 0,
>-				 0x80, spec->cur_eapd ? 0 : 0x80);
>-	snd_hda_codec_amp_update(codec, 0x06, 1, HDA_OUTPUT, 0,
>-				 0x80, spec->cur_eapd ? 0 : 0x80);
>+	snd_hda_codec_amp_stereo(codec, 0x06, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE,
>+				 spec->cur_eapd ? 0 : HDA_AMP_MUTE);
> 	return 1;
> }
> 
> /* bind volumes of both NID 0x05 and 0x06 */
>-static int ad1981_hp_master_vol_put(struct snd_kcontrol *kcontrol,
>-				    struct snd_ctl_elem_value *ucontrol)
>-{
>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>-	long *valp = ucontrol->value.integer.value;
>-	int change;
>-
>-	change = snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
>-					  0x7f, valp[0] & 0x7f);
>-	change |= snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
>-					   0x7f, valp[1] & 0x7f);
>-	snd_hda_codec_amp_update(codec, 0x06, 0, HDA_OUTPUT, 0,
>-				 0x7f, valp[0] & 0x7f);
>-	snd_hda_codec_amp_update(codec, 0x06, 1, HDA_OUTPUT, 0,
>-				 0x7f, valp[1] & 0x7f);
>-	return change;
>-}
>+static struct hda_bind_ctls ad1981_hp_bind_master_vol = {
>+	.ops = &snd_hda_bind_vol,
>+	.values = {
>+		HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
>+		HDA_COMPOSE_AMP_VAL(0x06, 3, 0, HDA_OUTPUT),
>+		0
>+	},
>+};
> 
> /* mute internal speaker if HP is plugged */
> static void ad1981_hp_automute(struct hda_codec *codec)
>@@ -1174,10 +1446,8 @@ static void ad1981_hp_automute(struct hda_codec *codec)
> 
> 	present = snd_hda_codec_read(codec, 0x06, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>-	snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>+	snd_hda_codec_amp_stereo(codec, 0x05, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
> }
> 
> /* toggle input of built-in and mic jack appropriately */
>@@ -1228,14 +1498,7 @@ static struct hda_input_mux ad1981_hp_capture_source = {
> };
> 
> static struct snd_kcontrol_new ad1981_hp_mixers[] = {
>-	{
>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Master Playback Volume",
>-		.info = snd_hda_mixer_amp_volume_info,
>-		.get = snd_hda_mixer_amp_volume_get,
>-		.put = ad1981_hp_master_vol_put,
>-		.private_value = HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
>-	},
>+	HDA_BIND_VOL("Master Playback Volume", &ad1981_hp_bind_master_vol),
> 	{
> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
> 		.name = "Master Playback Switch",
>@@ -1355,14 +1618,14 @@ static const char *ad1981_models[AD1981_MODELS] = {
> };
> 
> static struct snd_pci_quirk ad1981_cfg_tbl[] = {
>+	SND_PCI_QUIRK(0x1014, 0x0597, "Lenovo Z60", AD1981_THINKPAD),
> 	/* All HP models */
> 	SND_PCI_QUIRK(0x103c, 0, "HP nx", AD1981_HP),
>-	/* HP nx6320 (reversed SSID, H/W bug) */
>-	SND_PCI_QUIRK(0x30b0, 0x103c, "HP nx6320", AD1981_HP),
>+	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba U205", AD1981_TOSHIBA),
> 	/* Lenovo Thinkpad T60/X60/Z6xx */
> 	SND_PCI_QUIRK(0x17aa, 0, "Lenovo Thinkpad", AD1981_THINKPAD),
>-	SND_PCI_QUIRK(0x1014, 0x0597, "Lenovo Z60", AD1981_THINKPAD),
>-	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba U205", AD1981_TOSHIBA),
>+	/* HP nx6320 (reversed SSID, H/W bug) */
>+	SND_PCI_QUIRK(0x30b0, 0x103c, "HP nx6320", AD1981_HP),
> 	{}
> };
> 
>@@ -1390,6 +1653,10 @@ static int patch_ad1981(struct hda_codec *codec)
> 	spec->num_init_verbs = 1;
> 	spec->init_verbs[0] = ad1981_init_verbs;
> 	spec->spdif_route = 0;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = ad1981_loopbacks;
>+#endif
>+	spec->vmaster_nid = 0x05;
> 
> 	codec->patch_ops = ad198x_patch_ops;
> 
>@@ -1567,9 +1834,9 @@ static hda_nid_t ad1988_capsrc_nids[3] = {
> static struct hda_input_mux ad1988_6stack_capture_source = {
> 	.num_items = 5,
> 	.items = {
>-		{ "Front Mic", 0x0 },
>-		{ "Line", 0x1 },
>-		{ "Mic", 0x4 },
>+		{ "Front Mic", 0x1 },	/* port-B */
>+		{ "Line", 0x2 },	/* port-C */
>+		{ "Mic", 0x4 },		/* port-E */
> 		{ "CD", 0x5 },
> 		{ "Mix", 0x9 },
> 	},
>@@ -1578,7 +1845,7 @@ static struct hda_input_mux ad1988_6stack_capture_source = {
> static struct hda_input_mux ad1988_laptop_capture_source = {
> 	.num_items = 3,
> 	.items = {
>-		{ "Mic/Line", 0x0 },
>+		{ "Mic/Line", 0x1 },	/* port-B */
> 		{ "CD", 0x5 },
> 		{ "Mix", 0x9 },
> 	},
>@@ -1764,7 +2031,6 @@ static struct snd_kcontrol_new ad1988_capture_mixers[] = {
> 		.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",
>@@ -1797,15 +2063,19 @@ static int ad1988_spdif_playback_source_get(struct snd_kcontrol *kcontrol,
> 	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 = snd_hda_codec_read(codec, 0x1d, 0, AC_VERB_GET_AMP_GAIN_MUTE,
>+				 AC_AMP_GET_INPUT);
>+	if (!(sel & 0x80))
>+		ucontrol->value.enumerated.item[0] = 0;
>+	else {
>+		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;
> 	}
>-	ucontrol->value.enumerated.item[0] = sel;
> 	return 0;
> }
> 
>@@ -1813,23 +2083,45 @@ 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;
>+	unsigned int val, 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);
>+	val = ucontrol->value.enumerated.item[0];
>+	if (val > 3)
>+		return -EINVAL;
>+	if (!val) {
>+		sel = snd_hda_codec_read(codec, 0x1d, 0,
>+					 AC_VERB_GET_AMP_GAIN_MUTE,
>+					 AC_AMP_GET_INPUT);
>+		change = sel & 0x80;
>+		if (change) {
>+			snd_hda_codec_write_cache(codec, 0x1d, 0,
>+						  AC_VERB_SET_AMP_GAIN_MUTE,
>+						  AMP_IN_UNMUTE(0));
>+			snd_hda_codec_write_cache(codec, 0x1d, 0,
>+						  AC_VERB_SET_AMP_GAIN_MUTE,
>+						  AMP_IN_MUTE(1));
>+		}
> 	} 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];
>+		sel = snd_hda_codec_read(codec, 0x1d, 0,
>+					 AC_VERB_GET_AMP_GAIN_MUTE,
>+					 AC_AMP_GET_INPUT | 0x01);
>+		change = sel & 0x80;
>+		if (change) {
>+			snd_hda_codec_write_cache(codec, 0x1d, 0,
>+						  AC_VERB_SET_AMP_GAIN_MUTE,
>+						  AMP_IN_MUTE(0));
>+			snd_hda_codec_write_cache(codec, 0x1d, 0,
>+						  AC_VERB_SET_AMP_GAIN_MUTE,
>+						  AMP_IN_UNMUTE(1));
>+		}
>+		sel = snd_hda_codec_read(codec, 0x0b, 0,
>+					 AC_VERB_GET_CONNECT_SEL, 0) + 1;
>+		change |= sel != val;
> 		if (change)
>-			snd_hda_codec_write(codec, 0x02, 0, AC_VERB_SET_CONNECT_SEL,
>-					    ucontrol->value.enumerated.item[0] - 1);
>+			snd_hda_codec_write_cache(codec, 0x0b, 0,
>+						  AC_VERB_SET_CONNECT_SEL,
>+						  val - 1);
> 	}
> 	return change;
> }
>@@ -1851,6 +2143,10 @@ static struct snd_kcontrol_new ad1988_spdif_in_mixers[] = {
> 	{ } /* end */
> };
> 
>+static struct snd_kcontrol_new ad1989_spdif_out_mixers[] = {
>+	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
>+	{ } /* end */
>+};
> 
> /*
>  * initialization verbs
>@@ -1911,6 +2207,8 @@ static struct hda_verb ad1988_6stack_init_verbs[] = {
> 	{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},
>+	/* Analog CD Input */
>+	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
> 
> 	{ }
> };
>@@ -1942,14 +2240,20 @@ static struct hda_verb ad1988_spdif_init_verbs[] = {
> 	{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)},
>+	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(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 */
> 
> 	{ }
> };
> 
>+/* AD1989 has no ADC -> SPDIF route */
>+static struct hda_verb ad1989_spdif_init_verbs[] = {
>+	/* SPDIF out pin */
>+	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */
>+	{ }
>+};
>+
> /*
>  * verbs for 3stack (+dig)
>  */
>@@ -2120,6 +2424,15 @@ static void ad1988_laptop_unsol_event(struct hda_codec *codec, unsigned int res)
> 		snd_hda_sequence_write(codec, ad1988_laptop_hp_off);
> } 
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list ad1988_loopbacks[] = {
>+	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */
>+	{ 0x20, HDA_INPUT, 1 }, /* Line */
>+	{ 0x20, HDA_INPUT, 4 }, /* Mic */
>+	{ 0x20, HDA_INPUT, 6 }, /* CD */
>+	{ } /* end */
>+};
>+#endif
> 
> /*
>  * Automatic parse of I/O pins from the BIOS configuration
>@@ -2544,8 +2857,9 @@ static const char *ad1988_models[AD1988_MODEL_LAST] = {
> };
> 
> static struct snd_pci_quirk ad1988_cfg_tbl[] = {
>-	SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG),
> 	SND_PCI_QUIRK(0x1043, 0x81ec, "Asus P5B-DLX", AD1988_6STACK_DIG),
>+	SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG),
>+	SND_PCI_QUIRK(0x1043, 0x8277, "Asus P5K-E/WIFI-AP", AD1988_6STACK_DIG),
> 	{}
> };
> 
>@@ -2648,10 +2962,19 @@ static int patch_ad1988(struct hda_codec *codec)
> 	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 (codec->vendor_id >= 0x11d4989a) {
>+			spec->mixers[spec->num_mixers++] =
>+				ad1989_spdif_out_mixers;
>+			spec->init_verbs[spec->num_init_verbs++] =
>+				ad1989_spdif_init_verbs;
>+		} else {
>+			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)
>+	if (spec->dig_in_nid && codec->vendor_id < 0x11d4989a)
> 		spec->mixers[spec->num_mixers++] = ad1988_spdif_in_mixers;
> 
> 	codec->patch_ops = ad198x_patch_ops;
>@@ -2664,6 +2987,10 @@ static int patch_ad1988(struct hda_codec *codec)
> 		codec->patch_ops.unsol_event = ad1988_laptop_unsol_event;
> 		break;
> 	}
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = ad1988_loopbacks;
>+#endif
>+	spec->vmaster_nid = 0x04;
> 
> 	return 0;
> }
>@@ -2740,7 +3067,6 @@ static struct snd_kcontrol_new ad1884_base_mixers[] = {
> 		.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",
>@@ -2820,6 +3146,30 @@ static struct hda_verb ad1884_init_verbs[] = {
> 	{ } /* end */
> };
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list ad1884_loopbacks[] = {
>+	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */
>+	{ 0x20, HDA_INPUT, 1 }, /* Mic */
>+	{ 0x20, HDA_INPUT, 2 }, /* CD */
>+	{ 0x20, HDA_INPUT, 4 }, /* Docking */
>+	{ } /* end */
>+};
>+#endif
>+
>+static const char *ad1884_slave_vols[] = {
>+	"PCM Playback Volume",
>+	"Mic Playback Volume",
>+	"Mono Playback Volume",
>+	"Front Mic Playback Volume",
>+	"Mic Playback Volume",
>+	"CD Playback Volume",
>+	"Internal Mic Playback Volume",
>+	"Docking Mic Playback Volume"
>+	"Beep Playback Volume",
>+	"IEC958 Playback Volume",
>+	NULL
>+};
>+
> static int patch_ad1884(struct hda_codec *codec)
> {
> 	struct ad198x_spec *spec;
>@@ -2844,6 +3194,12 @@ static int patch_ad1884(struct hda_codec *codec)
> 	spec->num_init_verbs = 1;
> 	spec->init_verbs[0] = ad1884_init_verbs;
> 	spec->spdif_route = 0;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = ad1884_loopbacks;
>+#endif
>+	spec->vmaster_nid = 0x04;
>+	/* we need to cover all playback volumes */
>+	spec->slave_vols = ad1884_slave_vols;
> 
> 	codec->patch_ops = ad198x_patch_ops;
> 
>@@ -2854,14 +3210,29 @@ static int patch_ad1884(struct hda_codec *codec)
>  * Lenovo Thinkpad T61/X61
>  */
> static struct hda_input_mux ad1984_thinkpad_capture_source = {
>-	.num_items = 3,
>+	.num_items = 4,
> 	.items = {
> 		{ "Mic", 0x0 },
> 		{ "Internal Mic", 0x1 },
> 		{ "Mix", 0x3 },
>+		{ "Docking-Station", 0x4 },
> 	},
> };
> 
>+
>+/*
>+ * Dell Precision T3400
>+ */
>+static struct hda_input_mux ad1984_dell_desktop_capture_source = {
>+	.num_items = 3,
>+	.items = {
>+		{ "Front Mic", 0x0 },
>+		{ "Line-In", 0x1 },
>+		{ "Mix", 0x3 },
>+	},
>+};
>+
>+
> static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {
> 	HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),
> 	/* HDA_CODEC_VOLUME_IDX("PCM Playback Volume", 1, 0x03, 0x0, HDA_OUTPUT), */
>@@ -2886,7 +3257,6 @@ static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {
> 		.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",
>@@ -2895,6 +3265,16 @@ static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {
> 		.get = ad198x_mux_enum_get,
> 		.put = ad198x_mux_enum_put,
> 	},
>+	/* SPDIF controls */
>+	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
>+		/* identical with ad1983 */
>+		.info = ad1983_spdif_route_info,
>+		.get = ad1983_spdif_route_get,
>+		.put = ad1983_spdif_route_put,
>+	},
> 	{ } /* end */
> };
> 
>@@ -2912,6 +3292,44 @@ static struct hda_verb ad1984_thinkpad_init_verbs[] = {
> 	{ } /* end */
> };
> 
>+/*
>+ * Dell Precision T3400
>+ */
>+static struct snd_kcontrol_new ad1984_dell_desktop_mixers[] = {
>+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x12, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
>+	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Line-In Playback Volume", 0x20, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line-In Playback Switch", 0x20, 0x01, HDA_INPUT),
>+	/*
>+	HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x20, 0x03, HDA_INPUT),
>+	HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x20, 0x03, HDA_INPUT),
>+	*/
>+	HDA_CODEC_VOLUME("Line-In Boost", 0x15, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),
>+	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),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		/* The multiple "Capture Source" controls confuse alsamixer
>+		 * So call somewhat different..
>+		 */
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 2,
>+		.info = ad198x_mux_enum_info,
>+		.get = ad198x_mux_enum_get,
>+		.put = ad198x_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
> /* Digial MIC ADC NID 0x05 + 0x06 */
> static int ad1984_pcm_dmic_prepare(struct hda_pcm_stream *hinfo,
> 				   struct hda_codec *codec,
>@@ -2928,8 +3346,7 @@ static int ad1984_pcm_dmic_cleanup(struct hda_pcm_stream *hinfo,
> 				   struct hda_codec *codec,
> 				   struct snd_pcm_substream *substream)
> {
>-	snd_hda_codec_setup_stream(codec, 0x05 + substream->number,
>-				   0, 0, 0);
>+	snd_hda_codec_cleanup_stream(codec, 0x05 + substream->number);
> 	return 0;
> }
> 
>@@ -2965,17 +3382,20 @@ static int ad1984_build_pcms(struct hda_codec *codec)
> enum {
> 	AD1984_BASIC,
> 	AD1984_THINKPAD,
>+	AD1984_DELL_DESKTOP,
> 	AD1984_MODELS
> };
> 
> static const char *ad1984_models[AD1984_MODELS] = {
> 	[AD1984_BASIC]		= "basic",
> 	[AD1984_THINKPAD]	= "thinkpad",
>+	[AD1984_DELL_DESKTOP]	= "dell_desktop",
> };
> 
> static struct snd_pci_quirk ad1984_cfg_tbl[] = {
> 	/* Lenovo Thinkpad T61/X61 */
> 	SND_PCI_QUIRK(0x17aa, 0, "Lenovo Thinkpad", AD1984_THINKPAD),
>+	SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP),
> 	{}
> };
> 
>@@ -2997,12 +3417,489 @@ static int patch_ad1984(struct hda_codec *codec)
> 		codec->patch_ops.build_pcms = ad1984_build_pcms;
> 		break;
> 	case AD1984_THINKPAD:
>-		spec->multiout.dig_out_nid = 0;
>+		spec->multiout.dig_out_nid = AD1884_SPDIF_OUT;
> 		spec->input_mux = &ad1984_thinkpad_capture_source;
> 		spec->mixers[0] = ad1984_thinkpad_mixers;
> 		spec->init_verbs[spec->num_init_verbs++] = ad1984_thinkpad_init_verbs;
> 		break;
>+	case AD1984_DELL_DESKTOP:
>+		spec->multiout.dig_out_nid = 0;
>+		spec->input_mux = &ad1984_dell_desktop_capture_source;
>+		spec->mixers[0] = ad1984_dell_desktop_mixers;
>+		break;
>+	}
>+	return 0;
>+}
>+
>+
>+/*
>+ * AD1883 / AD1884A / AD1984A / AD1984B
>+ *
>+ * port-B (0x14) - front mic-in
>+ * port-E (0x1c) - rear mic-in
>+ * port-F (0x16) - CD / ext out
>+ * port-C (0x15) - rear line-in
>+ * port-D (0x12) - rear line-out
>+ * port-A (0x11) - front hp-out
>+ *
>+ * AD1984A = AD1884A + digital-mic
>+ * AD1883 = equivalent with AD1984A
>+ * AD1984B = AD1984A + extra SPDIF-out
>+ *
>+ * FIXME:
>+ * We share the single DAC for both HP and line-outs (see AD1884/1984).
>+ */
>+
>+static hda_nid_t ad1884a_dac_nids[1] = {
>+	0x03,
>+};
>+
>+#define ad1884a_adc_nids	ad1884_adc_nids
>+#define ad1884a_capsrc_nids	ad1884_capsrc_nids
>+
>+#define AD1884A_SPDIF_OUT	0x02
>+
>+static struct hda_input_mux ad1884a_capture_source = {
>+	.num_items = 5,
>+	.items = {
>+		{ "Front Mic", 0x0 },
>+		{ "Mic", 0x4 },
>+		{ "Line", 0x1 },
>+		{ "CD", 0x2 },
>+		{ "Mix", 0x3 },
>+	},
>+};
>+
>+static struct snd_kcontrol_new ad1884a_base_mixers[] = {
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Front Playback Switch", 0x12, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
>+	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
>+	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x01, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x04, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x04, HDA_INPUT),
>+	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x02, HDA_INPUT),
>+	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x02, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
>+	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Line Boost", 0x15, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x25, 0x0, HDA_OUTPUT),
>+	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),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		/* The multiple "Capture Source" controls confuse alsamixer
>+		 * So call somewhat different..
>+		 */
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 2,
>+		.info = ad198x_mux_enum_info,
>+		.get = ad198x_mux_enum_get,
>+		.put = ad198x_mux_enum_put,
>+	},
>+	/* SPDIF controls */
>+	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
>+		/* identical with ad1983 */
>+		.info = ad1983_spdif_route_info,
>+		.get = ad1983_spdif_route_get,
>+		.put = ad1983_spdif_route_put,
>+	},
>+	{ } /* end */
>+};
>+
>+/*
>+ * initialization verbs
>+ */
>+static struct hda_verb ad1884a_init_verbs[] = {
>+	/* DACs; unmute as default */
>+	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
>+	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
>+	/* Port-A (HP) mixer - route only from analog mixer */
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	/* Port-A pin */
>+	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	/* Port-D (Line-out) mixer - route only from analog mixer */
>+	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	/* Port-D pin */
>+	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	/* Mono-out mixer - route only from analog mixer */
>+	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	/* Mono-out pin */
>+	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	/* Port-B (front mic) pin */
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	/* Port-C (rear line-in) pin */
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
>+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	/* Port-E (rear mic) pin */
>+	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, /* no boost */
>+	/* Port-F (CD) pin */
>+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	/* Analog mixer; mute as default */
>+	{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_UNMUTE(4)}, /* aux */
>+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
>+	/* Analog Mix output amp */
>+	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	/* capture sources */
>+	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x0},
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0},
>+	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	/* SPDIF output amp */
>+	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */
>+	{ } /* end */
>+};
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list ad1884a_loopbacks[] = {
>+	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */
>+	{ 0x20, HDA_INPUT, 1 }, /* Mic */
>+	{ 0x20, HDA_INPUT, 2 }, /* CD */
>+	{ 0x20, HDA_INPUT, 4 }, /* Docking */
>+	{ } /* end */
>+};
>+#endif
>+
>+/*
>+ * Laptop model
>+ *
>+ * Port A: Headphone jack
>+ * Port B: MIC jack
>+ * Port C: Internal MIC
>+ * Port D: Dock Line Out (if enabled)
>+ * Port E: Dock Line In (if enabled)
>+ * Port F: Internal speakers
>+ */
>+
>+static struct hda_input_mux ad1884a_laptop_capture_source = {
>+	.num_items = 4,
>+	.items = {
>+		{ "Mic", 0x0 },		/* port-B */
>+		{ "Internal Mic", 0x1 }, /* port-C */
>+		{ "Dock Mic", 0x4 },	/* port-E */
>+		{ "Mix", 0x3 },
>+	},
>+};
>+
>+static struct snd_kcontrol_new ad1884a_laptop_mixers[] = {
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Dock Playback Switch", 0x12, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
>+	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x20, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x20, 0x01, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x20, 0x04, HDA_INPUT),
>+	HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x20, 0x04, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
>+	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Internal Mic Boost", 0x15, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Dock Mic Boost", 0x25, 0x0, HDA_OUTPUT),
>+	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),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		/* The multiple "Capture Source" controls confuse alsamixer
>+		 * So call somewhat different..
>+		 */
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 2,
>+		.info = ad198x_mux_enum_info,
>+		.get = ad198x_mux_enum_get,
>+		.put = ad198x_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new ad1884a_mobile_mixers[] = {
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
>+	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
>+	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Capture Volume", 0x14, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Internal Mic Capture Volume", 0x15, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
>+	{ } /* end */
>+};
>+
>+/* mute internal speaker if HP is plugged */
>+static void ad1884a_hp_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x11, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_EAPD_BTLENABLE,
>+			    present ? 0x00 : 0x02);
>+}
>+
>+/* switch to external mic if plugged */
>+static void ad1884a_hp_automic(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x14, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_write(codec, 0x0c, 0, AC_VERB_SET_CONNECT_SEL,
>+			    present ? 0 : 1);
>+}
>+
>+#define AD1884A_HP_EVENT		0x37
>+#define AD1884A_MIC_EVENT		0x36
>+
>+/* unsolicited event for HP jack sensing */
>+static void ad1884a_hp_unsol_event(struct hda_codec *codec, unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case AD1884A_HP_EVENT:
>+		ad1884a_hp_automute(codec);
>+		break;
>+	case AD1884A_MIC_EVENT:
>+		ad1884a_hp_automic(codec);
>+		break;
> 	}
>+}
>+
>+/* initialize jack-sensing, too */
>+static int ad1884a_hp_init(struct hda_codec *codec)
>+{
>+	ad198x_init(codec);
>+	ad1884a_hp_automute(codec);
>+	ad1884a_hp_automic(codec);
>+	return 0;
>+}
>+
>+/* additional verbs for laptop model */
>+static struct hda_verb ad1884a_laptop_verbs[] = {
>+	/* Port-A (HP) pin - always unmuted */
>+	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	/* Port-F (int speaker) mixer - route only from analog mixer */
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	/* Port-F pin */
>+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	/* Port-C pin - internal mic-in */
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */
>+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */
>+	/* analog mix */
>+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
>+	/* unsolicited event for pin-sense */
>+	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT},
>+	{ } /* end */
>+};
>+
>+/*
>+ * Thinkpad X300
>+ * 0x11 - HP
>+ * 0x12 - speaker
>+ * 0x14 - mic-in
>+ * 0x17 - built-in mic
>+ */
>+
>+static struct hda_verb ad1984a_thinkpad_verbs[] = {
>+	/* HP unmute */
>+	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	/* analog mix */
>+	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
>+	/* turn on EAPD */
>+	{0x12, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
>+	/* unsolicited event for pin-sense */
>+	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},
>+	/* internal mic - dmic */
>+	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
>+	/* set magic COEFs for dmic */
>+	{0x01, AC_VERB_SET_COEF_INDEX, 0x13f7},
>+	{0x01, AC_VERB_SET_PROC_COEF, 0x08},
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new ad1984a_thinkpad_mixers[] = {
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
>+	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
>+	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Internal Mic Boost", 0x17, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Capture Switch", 0x0c, 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,
>+	},
>+	{ } /* end */
>+};
>+
>+static struct hda_input_mux ad1984a_thinkpad_capture_source = {
>+	.num_items = 3,
>+	.items = {
>+		{ "Mic", 0x0 },
>+		{ "Internal Mic", 0x5 },
>+		{ "Mix", 0x3 },
>+	},
>+};
>+
>+/* mute internal speaker if HP is plugged */
>+static void ad1984a_thinkpad_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x11, 0, AC_VERB_GET_PIN_SENSE, 0)
>+		& AC_PINSENSE_PRESENCE;
>+	snd_hda_codec_amp_stereo(codec, 0x12, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+}
>+
>+/* unsolicited event for HP jack sensing */
>+static void ad1984a_thinkpad_unsol_event(struct hda_codec *codec,
>+					 unsigned int res)
>+{
>+	if ((res >> 26) != AD1884A_HP_EVENT)
>+		return;
>+	ad1984a_thinkpad_automute(codec);
>+}
>+
>+/* initialize jack-sensing, too */
>+static int ad1984a_thinkpad_init(struct hda_codec *codec)
>+{
>+	ad198x_init(codec);
>+	ad1984a_thinkpad_automute(codec);
>+	return 0;
>+}
>+
>+/*
>+ */
>+
>+enum {
>+	AD1884A_DESKTOP,
>+	AD1884A_LAPTOP,
>+	AD1884A_MOBILE,
>+	AD1884A_THINKPAD,
>+	AD1884A_MODELS
>+};
>+
>+static const char *ad1884a_models[AD1884A_MODELS] = {
>+	[AD1884A_DESKTOP]	= "desktop",
>+	[AD1884A_LAPTOP]	= "laptop",
>+	[AD1884A_MOBILE]	= "mobile",
>+	[AD1884A_THINKPAD]	= "thinkpad",
>+};
>+
>+static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
>+	SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
>+	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
>+	{}
>+};
>+
>+static int patch_ad1884a(struct hda_codec *codec)
>+{
>+	struct ad198x_spec *spec;
>+	int board_config;
>+
>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);
>+	if (spec == NULL)
>+		return -ENOMEM;
>+
>+	mutex_init(&spec->amp_mutex);
>+	codec->spec = spec;
>+
>+	spec->multiout.max_channels = 2;
>+	spec->multiout.num_dacs = ARRAY_SIZE(ad1884a_dac_nids);
>+	spec->multiout.dac_nids = ad1884a_dac_nids;
>+	spec->multiout.dig_out_nid = AD1884A_SPDIF_OUT;
>+	spec->num_adc_nids = ARRAY_SIZE(ad1884a_adc_nids);
>+	spec->adc_nids = ad1884a_adc_nids;
>+	spec->capsrc_nids = ad1884a_capsrc_nids;
>+	spec->input_mux = &ad1884a_capture_source;
>+	spec->num_mixers = 1;
>+	spec->mixers[0] = ad1884a_base_mixers;
>+	spec->num_init_verbs = 1;
>+	spec->init_verbs[0] = ad1884a_init_verbs;
>+	spec->spdif_route = 0;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = ad1884a_loopbacks;
>+#endif
>+	codec->patch_ops = ad198x_patch_ops;
>+
>+	/* override some parameters */
>+	board_config = snd_hda_check_board_config(codec, AD1884A_MODELS,
>+						  ad1884a_models,
>+						  ad1884a_cfg_tbl);
>+	switch (board_config) {
>+	case AD1884A_LAPTOP:
>+		spec->mixers[0] = ad1884a_laptop_mixers;
>+		spec->init_verbs[spec->num_init_verbs++] = ad1884a_laptop_verbs;
>+		spec->multiout.dig_out_nid = 0;
>+		spec->input_mux = &ad1884a_laptop_capture_source;
>+		codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;
>+		codec->patch_ops.init = ad1884a_hp_init;
>+		break;
>+	case AD1884A_MOBILE:
>+		spec->mixers[0] = ad1884a_mobile_mixers;
>+		spec->init_verbs[spec->num_init_verbs++] = ad1884a_laptop_verbs;
>+		spec->multiout.dig_out_nid = 0;
>+		codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;
>+		codec->patch_ops.init = ad1884a_hp_init;
>+		break;
>+	case AD1884A_THINKPAD:
>+		spec->mixers[0] = ad1984a_thinkpad_mixers;
>+		spec->init_verbs[spec->num_init_verbs++] =
>+			ad1984a_thinkpad_verbs;
>+		spec->multiout.dig_out_nid = 0;
>+		spec->input_mux = &ad1984a_thinkpad_capture_source;
>+		codec->patch_ops.unsol_event = ad1984a_thinkpad_unsol_event;
>+		codec->patch_ops.init = ad1984a_thinkpad_init;
>+		break;
>+	}
>+
> 	return 0;
> }
> 
>@@ -3075,7 +3972,6 @@ static struct snd_kcontrol_new ad1882_base_mixers[] = {
> 		.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",
>@@ -3225,6 +4121,16 @@ static struct hda_verb ad1882_init_verbs[] = {
> 	{ } /* end */
> };
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list ad1882_loopbacks[] = {
>+	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */
>+	{ 0x20, HDA_INPUT, 1 }, /* Mic */
>+	{ 0x20, HDA_INPUT, 4 }, /* Line */
>+	{ 0x20, HDA_INPUT, 6 }, /* CD */
>+	{ } /* end */
>+};
>+#endif
>+
> /* models */
> enum {
> 	AD1882_3STACK,
>@@ -3263,6 +4169,10 @@ static int patch_ad1882(struct hda_codec *codec)
> 	spec->num_init_verbs = 1;
> 	spec->init_verbs[0] = ad1882_init_verbs;
> 	spec->spdif_route = 0;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = ad1882_loopbacks;
>+#endif
>+	spec->vmaster_nid = 0x04;
> 
> 	codec->patch_ops = ad198x_patch_ops;
> 
>@@ -3293,13 +4203,19 @@ static int patch_ad1882(struct hda_codec *codec)
>  * patch entries
>  */
> struct hda_codec_preset snd_hda_preset_analog[] = {
>+	{ .id = 0x11d4184a, .name = "AD1884A", .patch = patch_ad1884a },
> 	{ .id = 0x11d41882, .name = "AD1882", .patch = patch_ad1882 },
>+	{ .id = 0x11d41883, .name = "AD1883", .patch = patch_ad1884a },
> 	{ .id = 0x11d41884, .name = "AD1884", .patch = patch_ad1884 },
>+	{ .id = 0x11d4194a, .name = "AD1984A", .patch = patch_ad1884a },
>+	{ .id = 0x11d4194b, .name = "AD1984B", .patch = patch_ad1884a },
> 	{ .id = 0x11d41981, .name = "AD1981", .patch = patch_ad1981 },
> 	{ .id = 0x11d41983, .name = "AD1983", .patch = patch_ad1983 },
> 	{ .id = 0x11d41984, .name = "AD1984", .patch = patch_ad1984 },
> 	{ .id = 0x11d41986, .name = "AD1986A", .patch = patch_ad1986a },
> 	{ .id = 0x11d41988, .name = "AD1988", .patch = patch_ad1988 },
> 	{ .id = 0x11d4198b, .name = "AD1988B", .patch = patch_ad1988 },
>+	{ .id = 0x11d4989a, .name = "AD1989A", .patch = patch_ad1988 },
>+	{ .id = 0x11d4989b, .name = "AD1989B", .patch = patch_ad1988 },
> 	{} /* terminator */
> };
>diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c
>index 88d545f..108b0f1 100644
>--- a/sound/pci/hda/patch_atihdmi.c
>+++ b/sound/pci/hda/patch_atihdmi.c
>@@ -25,10 +25,10 @@
> #include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/slab.h>
>-#include <linux/pci.h>
> #include <sound/core.h>
> #include "hda_codec.h"
> #include "hda_local.h"
>+#include "hda_patch.h"
> 
> struct atihdmi_spec {
> 	struct hda_multi_out multiout;
>@@ -60,22 +60,13 @@ static int atihdmi_build_controls(struct hda_codec *codec)
> static int atihdmi_init(struct hda_codec *codec)
> {
> 	snd_hda_sequence_write(codec, atihdmi_basic_init);
>+	/* SI codec requires to unmute the pin */
>+	if (get_wcaps(codec, 0x03) & AC_WCAP_OUT_AMP)
>+		snd_hda_codec_write(codec, 0x03, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>+				    AMP_OUT_UNMUTE);
> 	return 0;
> }
> 
>-#ifdef CONFIG_PM
>-/*
>- * resume
>- */
>-static int atihdmi_resume(struct hda_codec *codec)
>-{
>-	atihdmi_init(codec);
>-	snd_hda_resume_spdif_out(codec);
>-
>-	return 0;
>-}
>-#endif
>-
> /*
>  * Digital out
>  */
>@@ -95,6 +86,17 @@ static int atihdmi_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
> 	return snd_hda_multi_out_dig_close(codec, &spec->multiout);
> }
> 
>+static int atihdmi_dig_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 atihdmi_spec *spec = codec->spec;
>+	return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
>+					     format, substream);
>+}
>+
> static struct hda_pcm_stream atihdmi_pcm_digital_playback = {
> 	.substreams = 1,
> 	.channels_min = 2,
>@@ -102,7 +104,8 @@ static struct hda_pcm_stream atihdmi_pcm_digital_playback = {
> 	.nid = 0x2, /* NID to query formats and rates and setup streams */
> 	.ops = {
> 		.open = atihdmi_dig_playback_pcm_open,
>-		.close = atihdmi_dig_playback_pcm_close
>+		.close = atihdmi_dig_playback_pcm_close,
>+		.prepare = atihdmi_dig_playback_pcm_prepare
> 	},
> };
> 
>@@ -115,6 +118,7 @@ static int atihdmi_build_pcms(struct hda_codec *codec)
> 	codec->pcm_info = info;
> 
> 	info->name = "ATI HDMI";
>+	info->pcm_type = HDA_PCM_TYPE_HDMI;
> 	info->stream[SNDRV_PCM_STREAM_PLAYBACK] = atihdmi_pcm_digital_playback;
> 
> 	return 0;
>@@ -130,9 +134,6 @@ static struct hda_codec_ops atihdmi_patch_ops = {
> 	.build_pcms = atihdmi_build_pcms,
> 	.init = atihdmi_init,
> 	.free = atihdmi_free,
>-#ifdef CONFIG_PM
>-	.resume = atihdmi_resume,
>-#endif
> };
> 
> static int patch_atihdmi(struct hda_codec *codec)
>@@ -161,7 +162,10 @@ static int patch_atihdmi(struct hda_codec *codec)
>  */
> struct hda_codec_preset snd_hda_preset_atihdmi[] = {
> 	{ .id = 0x1002793c, .name = "ATI RS600 HDMI", .patch = patch_atihdmi },
>+	{ .id = 0x10027919, .name = "ATI RS600 HDMI", .patch = patch_atihdmi },
> 	{ .id = 0x1002791a, .name = "ATI RS690/780 HDMI", .patch = patch_atihdmi },
> 	{ .id = 0x1002aa01, .name = "ATI R6xx HDMI", .patch = patch_atihdmi },
>-        {} /* terminator */
>+	{ .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_atihdmi },
>+	{ .id = 0x17e80047, .name = "Chrontel HDMI",  .patch = patch_atihdmi },
>+	{} /* terminator */
> };
>diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
>index 5b9d3a3..e6e16c6 100644
>--- a/sound/pci/hda/patch_cmedia.c
>+++ b/sound/pci/hda/patch_cmedia.c
>@@ -29,6 +29,7 @@
> #include <sound/core.h>
> #include "hda_codec.h"
> #include "hda_local.h"
>+#include "hda_patch.h"
> #define NUM_PINS	11
> 
> 
>@@ -50,7 +51,7 @@ struct cmi_spec {
> 
> 	/* playback */
> 	struct hda_multi_out multiout;
>-	hda_nid_t dac_nids[4];		/* NID for each DAC */
>+	hda_nid_t dac_nids[AUTO_CFG_MAX_OUTS];	/* NID for each DAC */
> 	int num_dacs;
> 
> 	/* capture */
>@@ -73,7 +74,6 @@ struct cmi_spec {
> 	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 */
> };
> 
>@@ -187,7 +187,6 @@ static struct snd_kcontrol_new cmi9880_basic_mixer[] = {
> 		.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",
>@@ -332,6 +331,11 @@ static int cmi9880_build_controls(struct hda_codec *codec)
> 		err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
> 		if (err < 0)
> 			return err;
>+		err = snd_hda_create_spdif_share_sw(codec,
>+						    &spec->multiout);
>+		if (err < 0)
>+			return err;
>+		spec->multiout.share_spdif = 1;
> 	}
> 	if (spec->dig_in_nid) {
> 		err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
>@@ -427,27 +431,6 @@ static int cmi9880_init(struct hda_codec *codec)
> 	return 0;
> }
> 
>-#ifdef CONFIG_PM
>-/*
>- * resume
>- */
>-static int cmi9880_resume(struct hda_codec *codec)
>-{
>-	struct cmi_spec *spec = codec->spec;
>-
>-	cmi9880_init(codec);
>-	snd_hda_resume_ctls(codec, cmi9880_basic_mixer);
>-	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);
>-
>-	return 0;
>-}
>-#endif
>-
> /*
>  * Analog playback callbacks
>  */
>@@ -456,7 +439,8 @@ static int cmi9880_playback_pcm_open(struct hda_pcm_stream *hinfo,
> 				     struct snd_pcm_substream *substream)
> {
> 	struct cmi_spec *spec = codec->spec;
>-	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
>+	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
>+					     hinfo);
> }
> 
> static int cmi9880_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
>@@ -497,6 +481,17 @@ static int cmi9880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
> 	return snd_hda_multi_out_dig_close(codec, &spec->multiout);
> }
> 
>+static int cmi9880_dig_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 cmi_spec *spec = codec->spec;
>+	return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
>+					     format, substream);
>+}
>+
> /*
>  * Analog capture
>  */
>@@ -519,7 +514,7 @@ static int cmi9880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
> {
> 	struct cmi_spec *spec = codec->spec;
> 
>-	snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number], 0, 0, 0);
>+	snd_hda_codec_cleanup_stream(codec, spec->adc_nids[substream->number]);
> 	return 0;
> }
> 
>@@ -556,7 +551,8 @@ static struct hda_pcm_stream cmi9880_pcm_digital_playback = {
> 	/* NID is set in cmi9880_build_pcms */
> 	.ops = {
> 		.open = cmi9880_dig_playback_pcm_open,
>-		.close = cmi9880_dig_playback_pcm_close
>+		.close = cmi9880_dig_playback_pcm_close,
>+		.prepare = cmi9880_dig_playback_pcm_prepare
> 	},
> };
> 
>@@ -583,6 +579,7 @@ static int cmi9880_build_pcms(struct hda_codec *codec)
> 		codec->num_pcms++;
> 		info++;
> 		info->name = "CMI9880 Digital";
>+		info->pcm_type = HDA_PCM_TYPE_SPDIF;
> 		if (spec->multiout.dig_out_nid) {
> 			info->stream[SNDRV_PCM_STREAM_PLAYBACK] = cmi9880_pcm_digital_playback;
> 			info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
>@@ -615,6 +612,8 @@ static const char *cmi9880_models[CMI_MODELS] = {
> 
> static struct snd_pci_quirk cmi9880_cfg_tbl[] = {
> 	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", CMI_FULL_DIG),
>+	SND_PCI_QUIRK(0x1854, 0x002b, "LG LS75", CMI_MINIMAL),
>+	SND_PCI_QUIRK(0x1854, 0x0032, "LG", CMI_FULL_DIG),
> 	{} /* terminator */
> };
> 
>@@ -623,9 +622,6 @@ static struct hda_codec_ops cmi9880_patch_ops = {
> 	.build_pcms = cmi9880_build_pcms,
> 	.init = cmi9880_init,
> 	.free = cmi9880_free,
>-#ifdef CONFIG_PM
>-	.resume = cmi9880_resume,
>-#endif
> };
> 
> static int patch_cmi9880(struct hda_codec *codec)
>diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
>index 46e93c6..c15088b 100644
>--- a/sound/pci/hda/patch_conexant.c
>+++ b/sound/pci/hda/patch_conexant.c
>@@ -28,6 +28,7 @@
> #include <sound/core.h>
> #include "hda_codec.h"
> #include "hda_local.h"
>+#include "hda_patch.h"
> 
> #define CXT_PIN_DIR_IN              0x00
> #define CXT_PIN_DIR_OUT             0x01
>@@ -65,6 +66,11 @@ struct conexant_spec {
> 	hda_nid_t *adc_nids;
> 	hda_nid_t dig_in_nid;		/* digital-in NID; optional */
> 
>+	unsigned int cur_adc_idx;
>+	hda_nid_t cur_adc;
>+	unsigned int cur_adc_stream_tag;
>+	unsigned int cur_adc_format;
>+
> 	/* capture source */
> 	const struct hda_input_mux *input_mux;
> 	hda_nid_t *capsrc_nids;
>@@ -85,7 +91,7 @@ struct conexant_spec {
> 	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];
>+	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
> 
> };
> 
>@@ -94,7 +100,8 @@ static int conexant_playback_pcm_open(struct hda_pcm_stream *hinfo,
> 				      struct snd_pcm_substream *substream)
> {
> 	struct conexant_spec *spec = codec->spec;
>-	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
>+	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
>+					     hinfo);
> }
> 
> static int conexant_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
>@@ -136,6 +143,18 @@ static int conexant_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
> 	return snd_hda_multi_out_dig_close(codec, &spec->multiout);
> }
> 
>+static int conexant_dig_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 conexant_spec *spec = codec->spec;
>+	return snd_hda_multi_out_dig_prepare(codec, &spec->multiout,
>+					     stream_tag,
>+					     format, substream);
>+}
>+
> /*
>  * Analog capture
>  */
>@@ -156,8 +175,7 @@ static int conexant_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
> 				      struct snd_pcm_substream *substream)
> {
> 	struct conexant_spec *spec = codec->spec;
>-	snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
>-				   0, 0, 0);
>+	snd_hda_codec_cleanup_stream(codec, spec->adc_nids[substream->number]);
> 	return 0;
> }
> 
>@@ -194,7 +212,8 @@ static struct hda_pcm_stream conexant_pcm_digital_playback = {
> 	.nid = 0, /* fill later */
> 	.ops = {
> 		.open = conexant_dig_playback_pcm_open,
>-		.close = conexant_dig_playback_pcm_close
>+		.close = conexant_dig_playback_pcm_close,
>+		.prepare = conexant_dig_playback_pcm_prepare
> 	},
> };
> 
>@@ -205,6 +224,41 @@ static struct hda_pcm_stream conexant_pcm_digital_capture = {
> 	/* NID is set in alc_build_pcms */
> };
> 
>+static int cx5051_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 conexant_spec *spec = codec->spec;
>+	spec->cur_adc = spec->adc_nids[spec->cur_adc_idx];
>+	spec->cur_adc_stream_tag = stream_tag;
>+	spec->cur_adc_format = format;
>+	snd_hda_codec_setup_stream(codec, spec->cur_adc, stream_tag, 0, format);
>+	return 0;
>+}
>+
>+static int cx5051_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
>+				      struct hda_codec *codec,
>+				      struct snd_pcm_substream *substream)
>+{
>+	struct conexant_spec *spec = codec->spec;
>+	snd_hda_codec_cleanup_stream(codec, spec->cur_adc);
>+	spec->cur_adc = 0;
>+	return 0;
>+}
>+
>+static struct hda_pcm_stream cx5051_pcm_analog_capture = {
>+	.substreams = 1,
>+	.channels_min = 2,
>+	.channels_max = 2,
>+	.nid = 0, /* fill later */
>+	.ops = {
>+		.prepare = cx5051_capture_pcm_prepare,
>+		.cleanup = cx5051_capture_pcm_cleanup
>+	},
>+};
>+
> static int conexant_build_pcms(struct hda_codec *codec)
> {
> 	struct conexant_spec *spec = codec->spec;
>@@ -219,7 +273,12 @@ static int conexant_build_pcms(struct hda_codec *codec)
> 		spec->multiout.max_channels;
> 	info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
> 		spec->multiout.dac_nids[0];
>-	info->stream[SNDRV_PCM_STREAM_CAPTURE] = conexant_pcm_analog_capture;
>+	if (codec->vendor_id == 0x14f15051)
>+		info->stream[SNDRV_PCM_STREAM_CAPTURE] =
>+			cx5051_pcm_analog_capture;
>+	else
>+		info->stream[SNDRV_PCM_STREAM_CAPTURE] =
>+			conexant_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];
> 
>@@ -227,6 +286,7 @@ static int conexant_build_pcms(struct hda_codec *codec)
> 		info++;
> 		codec->num_pcms++;
> 		info->name = "Conexant Digital";
>+		info->pcm_type = HDA_PCM_TYPE_SPDIF;
> 		info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
> 			conexant_pcm_digital_playback;
> 		info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
>@@ -298,23 +358,6 @@ static void conexant_free(struct hda_codec *codec)
> 	kfree(codec->spec);
> }
> 
>-#ifdef CONFIG_PM
>-static int conexant_resume(struct hda_codec *codec)
>-{
>-	struct conexant_spec *spec = codec->spec;
>-	int i;
>-
>-	codec->patch_ops.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 int conexant_build_controls(struct hda_codec *codec)
> {
> 	struct conexant_spec *spec = codec->spec;
>@@ -331,6 +374,11 @@ static int conexant_build_controls(struct hda_codec *codec)
> 						    spec->multiout.dig_out_nid);
> 		if (err < 0)
> 			return err;
>+		err = snd_hda_create_spdif_share_sw(codec,
>+						    &spec->multiout);
>+		if (err < 0)
>+			return err;
>+		spec->multiout.share_spdif = 1;
> 	} 
> 	if (spec->dig_in_nid) {
> 		err = snd_hda_create_spdif_in_ctls(codec,spec->dig_in_nid);
>@@ -345,9 +393,6 @@ static struct hda_codec_ops conexant_patch_ops = {
> 	.build_pcms = conexant_build_pcms,
> 	.init = conexant_init,
> 	.free = conexant_free,
>-#ifdef CONFIG_PM
>-	.resume = conexant_resume,
>-#endif
> };
> 
> /*
>@@ -355,15 +400,7 @@ static struct hda_codec_ops conexant_patch_ops = {
>  * the private value = nid | (invert << 8)
>  */
> 
>-static int cxt_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;
>-}
>+#define cxt_eapd_info		snd_ctl_boolean_mono_info
> 
> static int cxt_eapd_get(struct snd_kcontrol *kcontrol,
> 			     struct snd_ctl_elem_value *ucontrol)
>@@ -388,16 +425,16 @@ static int cxt_eapd_put(struct snd_kcontrol *kcontrol,
> 	hda_nid_t nid = kcontrol->private_value & 0xff;
> 	unsigned int eapd;
> 
>-	eapd = ucontrol->value.integer.value[0];
>+	eapd = !!ucontrol->value.integer.value[0];
> 	if (invert)
> 		eapd = !eapd;
>-	if (eapd == spec->cur_eapd && !codec->in_resume)
>+	if (eapd == spec->cur_eapd)
> 		return 0;
> 	
> 	spec->cur_eapd = eapd;
>-	snd_hda_codec_write(codec, nid,
>-			    0, AC_VERB_SET_EAPD_BTLENABLE,
>-			    eapd ? 0x02 : 0x00);
>+	snd_hda_codec_write_cache(codec, nid,
>+				  0, AC_VERB_SET_EAPD_BTLENABLE,
>+				  eapd ? 0x02 : 0x00);
> 	return 1;
> }
> 
>@@ -452,115 +489,6 @@ static int conexant_ch_mode_put(struct snd_kcontrol *kcontrol,
> 	  .put = conexant_ch_mode_put, \
> 	  .private_value = nid | (dir<<16) }
> 
>-static int cxt_gpio_data_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 cxt_gpio_data_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;
>-	unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
>-	long *valp = ucontrol->value.integer.value;
>-	unsigned int val = snd_hda_codec_read(codec, nid, 0,
>-					      AC_VERB_GET_GPIO_DATA, 0x00);
>-
>-	*valp = (val & mask) != 0;
>-	return 0;
>-}
>-
>-static int cxt_gpio_data_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;
>-	unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
>-	long val = *ucontrol->value.integer.value;
>-	unsigned int gpio_data = snd_hda_codec_read(codec, nid, 0,
>-						    AC_VERB_GET_GPIO_DATA,
>-						    0x00);
>-	unsigned int old_data = gpio_data;
>-
>-	/* Set/unset the masked GPIO bit(s) as needed */
>-	if (val == 0)
>-		gpio_data &= ~mask;
>-	else
>-		gpio_data |= mask;
>-	if (gpio_data == old_data && !codec->in_resume)
>-		return 0;
>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_GPIO_DATA, gpio_data);
>-	return 1;
>-}
>-
>-#define CXT_GPIO_DATA_SWITCH(xname, nid, mask) \
>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
>-	  .info = cxt_gpio_data_info, \
>-	  .get = cxt_gpio_data_get, \
>-	  .put = cxt_gpio_data_put, \
>-	  .private_value = nid | (mask<<16) }
>-#if 0
>-static int cxt_spdif_ctrl_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 cxt_spdif_ctrl_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;
>-	unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
>-	long *valp = ucontrol->value.integer.value;
>-	unsigned int val = snd_hda_codec_read(codec, nid, 0,
>-					      AC_VERB_GET_DIGI_CONVERT, 0x00);
>-
>-	*valp = (val & mask) != 0;
>-	return 0;
>-}
>-
>-static int cxt_spdif_ctrl_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;
>-	unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
>-	long val = *ucontrol->value.integer.value;
>-	unsigned int ctrl_data = snd_hda_codec_read(codec, nid, 0,
>-						    AC_VERB_GET_DIGI_CONVERT,
>-						    0x00);
>-	unsigned int old_data = ctrl_data;
>-
>-	/* Set/unset the masked control bit(s) as needed */
>-	if (val == 0)
>-		ctrl_data &= ~mask;
>-	else
>-		ctrl_data |= mask;
>-	if (ctrl_data == old_data && !codec->in_resume)
>-		return 0;
>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
>-			    ctrl_data);
>-	return 1;
>-}
>-
>-#define CXT_SPDIF_CTRL_SWITCH(xname, nid, mask) \
>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
>-	  .info = cxt_spdif_ctrl_info, \
>-	  .get = cxt_spdif_ctrl_get, \
>-	  .put = cxt_spdif_ctrl_put, \
>-	  .private_value = nid | (mask<<16) }
>-#endif
> #endif /* CONFIG_SND_DEBUG */
> 
> /* Conexant 5045 specific */
>@@ -568,7 +496,7 @@ static int cxt_spdif_ctrl_put(struct snd_kcontrol *kcontrol,
> static hda_nid_t cxt5045_dac_nids[1] = { 0x19 };
> static hda_nid_t cxt5045_adc_nids[1] = { 0x1a };
> static hda_nid_t cxt5045_capsrc_nids[1] = { 0x1a };
>-#define CXT5045_SPDIF_OUT	0x13
>+#define CXT5045_SPDIF_OUT	0x18
> 
> static struct hda_channel_mode cxt5045_modes[1] = {
> 	{ 2, NULL },
>@@ -578,7 +506,24 @@ static struct hda_input_mux cxt5045_capture_source = {
> 	.num_items = 2,
> 	.items = {
> 		{ "IntMic", 0x1 },
>-		{ "LineIn", 0x2 },
>+		{ "ExtMic", 0x2 },
>+	}
>+};
>+
>+static struct hda_input_mux cxt5045_capture_source_benq = {
>+	.num_items = 3,
>+	.items = {
>+		{ "IntMic", 0x1 },
>+		{ "ExtMic", 0x2 },
>+		{ "LineIn", 0x3 },
>+	}
>+};
>+
>+static struct hda_input_mux cxt5045_capture_source_hp530 = {
>+	.num_items = 2,
>+	.items = {
>+		{ "ExtMic", 0x1 },
>+		{ "IntMic", 0x2 },
> 	}
> };
> 
>@@ -596,32 +541,47 @@ static int cxt5045_hp_master_sw_put(struct snd_kcontrol *kcontrol,
> 	/* toggle internal speakers mute depending of presence of
> 	 * the headphone jack
> 	 */
>-	bits = (!spec->hp_present && spec->cur_eapd) ? 0 : 0x80;
>-	snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, bits);
>-	snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, bits);
>-	bits = spec->cur_eapd ? 0 : 0x80;
>-	snd_hda_codec_amp_update(codec, 0x11, 0, HDA_OUTPUT, 0, 0x80, bits);
>-	snd_hda_codec_amp_update(codec, 0x11, 1, HDA_OUTPUT, 0, 0x80, bits);
>+	bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE;
>+	snd_hda_codec_amp_stereo(codec, 0x10, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+
>+	bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE;
>+	snd_hda_codec_amp_stereo(codec, 0x11, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
> 	return 1;
> }
> 
> /* bind volumes of both NID 0x10 and 0x11 */
>-static int cxt5045_hp_master_vol_put(struct snd_kcontrol *kcontrol,
>-				     struct snd_ctl_elem_value *ucontrol)
>+static struct hda_bind_ctls cxt5045_hp_bind_master_vol = {
>+	.ops = &snd_hda_bind_vol,
>+	.values = {
>+		HDA_COMPOSE_AMP_VAL(0x10, 3, 0, HDA_OUTPUT),
>+		HDA_COMPOSE_AMP_VAL(0x11, 3, 0, HDA_OUTPUT),
>+		0
>+	},
>+};
>+
>+/* toggle input of built-in and mic jack appropriately */
>+static void cxt5045_hp_automic(struct hda_codec *codec)
> {
>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>-	long *valp = ucontrol->value.integer.value;
>-	int change;
>-
>-	change = snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0,
>-					  0x7f, valp[0] & 0x7f);
>-	change |= snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0,
>-					   0x7f, valp[1] & 0x7f);
>-	snd_hda_codec_amp_update(codec, 0x11, 0, HDA_OUTPUT, 0,
>-				 0x7f, valp[0] & 0x7f);
>-	snd_hda_codec_amp_update(codec, 0x11, 1, HDA_OUTPUT, 0,
>-				 0x7f, valp[1] & 0x7f);
>-	return change;
>+	static struct hda_verb mic_jack_on[] = {
>+		{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
>+		{0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
>+		{}
>+	};
>+	static struct hda_verb mic_jack_off[] = {
>+		{0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
>+		{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
>+		{}
>+	};
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x12, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	if (present)
>+		snd_hda_sequence_write(codec, mic_jack_on);
>+	else
>+		snd_hda_sequence_write(codec, mic_jack_off);
> }
> 
> 
>@@ -634,9 +594,9 @@ static void cxt5045_hp_automute(struct hda_codec *codec)
> 	spec->hp_present = snd_hda_codec_read(codec, 0x11, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
> 
>-	bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0;
>-	snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, bits);
>-	snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, bits);
>+	bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0; 
>+	snd_hda_codec_amp_stereo(codec, 0x10, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
> }
> 
> /* unsolicited event for HP jack sensing */
>@@ -648,6 +608,10 @@ static void cxt5045_hp_unsol_event(struct hda_codec *codec,
> 	case CONEXANT_HP_EVENT:
> 		cxt5045_hp_automute(codec);
> 		break;
>+	case CONEXANT_MIC_EVENT:
>+		cxt5045_hp_automic(codec);
>+		break;
>+
> 	}
> }
> 
>@@ -659,20 +623,57 @@ static struct snd_kcontrol_new cxt5045_mixers[] = {
> 		.get = conexant_mux_enum_get,
> 		.put = conexant_mux_enum_put
> 	},
>-	HDA_CODEC_VOLUME("Int Mic Volume", 0x17, 0x01, HDA_INPUT),
>-	HDA_CODEC_MUTE("Int Mic Switch", 0x17, 0x01, HDA_INPUT),
>-	HDA_CODEC_VOLUME("Ext Mic Volume", 0x17, 0x02, HDA_INPUT),
>-	HDA_CODEC_MUTE("Ext Mic Switch", 0x17, 0x02, HDA_INPUT),
>-	HDA_CODEC_VOLUME("Capture Volume", 0x1a, 0x0, HDA_INPUT),
>-	HDA_CODEC_MUTE("Capture Switch", 0x1a, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("Int Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),
>+	HDA_CODEC_MUTE("Ext Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),
>+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x17, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x17, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x17, 0x2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x17, 0x2, HDA_INPUT),
>+	HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol),
> 	{
> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Master Playback Volume",
>-		.info = snd_hda_mixer_amp_volume_info,
>-		.get = snd_hda_mixer_amp_volume_get,
>-		.put = cxt5045_hp_master_vol_put,
>-		.private_value = HDA_COMPOSE_AMP_VAL(0x10, 3, 0, HDA_OUTPUT),
>+		.name = "Master Playback Switch",
>+		.info = cxt_eapd_info,
>+		.get = cxt_eapd_get,
>+		.put = cxt5045_hp_master_sw_put,
>+		.private_value = 0x10,
>+	},
>+
>+	{}
>+};
>+
>+static struct snd_kcontrol_new cxt5045_benq_mixers[] = {
>+	HDA_CODEC_VOLUME("Line In Capture Volume", 0x1a, 0x03, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line In Capture Switch", 0x1a, 0x03, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Line In Playback Volume", 0x17, 0x3, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line In Playback Switch", 0x17, 0x3, HDA_INPUT),
>+
>+	{}
>+};
>+
>+static struct snd_kcontrol_new cxt5045_mixers_hp530[] = {
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Capture Source",
>+		.info = conexant_mux_enum_info,
>+		.get = conexant_mux_enum_get,
>+		.put = conexant_mux_enum_put
> 	},
>+	HDA_CODEC_VOLUME("Int Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),
>+	HDA_CODEC_MUTE("Int Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("Ext Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),
>+	HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x17, 0x2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x17, 0x2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x17, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x17, 0x1, HDA_INPUT),
>+	HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol),
> 	{
> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
> 		.name = "Master Playback Switch",
>@@ -688,31 +689,67 @@ static struct snd_kcontrol_new cxt5045_mixers[] = {
> static struct hda_verb cxt5045_init_verbs[] = {
> 	/* Line in, Mic */
> 	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },
> 	/* HP, Amp  */
>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
>-	{0x17, AC_VERB_SET_CONNECT_SEL,0x01},
>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE,
>-	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x01},
>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE,
>-	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x02},
>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE,
>-	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x03},
>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE,
>-	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x04},
>+	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x10, AC_VERB_SET_CONNECT_SEL, 0x1},
>+	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x11, AC_VERB_SET_CONNECT_SEL, 0x1},
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
> 	/* Record selector: Int mic */
>-	{0x1a, AC_VERB_SET_CONNECT_SEL,0x0},
>+	{0x1a, AC_VERB_SET_CONNECT_SEL,0x1},
> 	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE,
> 	 AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
> 	/* SPDIF route: PCM */
>+	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
> 	{ 0x13, AC_VERB_SET_CONNECT_SEL, 0x0 },
>-	/* pin sensing on HP and Mic jacks */
>-	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
> 	/* EAPD */
> 	{0x10, AC_VERB_SET_EAPD_BTLENABLE, 0x2 }, /* default on */ 
> 	{ } /* end */
> };
> 
>+static struct hda_verb cxt5045_benq_init_verbs[] = {
>+	/* Int Mic, Mic */
>+	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },
>+	/* Line In,HP, Amp  */
>+	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x10, AC_VERB_SET_CONNECT_SEL, 0x1},
>+	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
>+	{0x11, AC_VERB_SET_CONNECT_SEL, 0x1},
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
>+	/* Record selector: Int mic */
>+	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x1},
>+	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE,
>+	 AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
>+	/* SPDIF route: PCM */
>+	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
>+	/* EAPD */
>+	{0x10, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
>+	{ } /* end */
>+};
>+
>+static struct hda_verb cxt5045_hp_sense_init_verbs[] = {
>+	/* pin sensing on HP jack */
>+	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
>+	{ } /* end */
>+};
>+
>+static struct hda_verb cxt5045_mic_sense_init_verbs[] = {
>+	/* pin sensing on HP jack */
>+	{0x12, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},
>+	{ } /* end */
>+};
>+
> #ifdef CONFIG_SND_DEBUG
> /* Test configuration for debugging, modelled after the ALC260 test
>  * configuration.
>@@ -733,6 +770,10 @@ static struct snd_kcontrol_new cxt5045_test_mixer[] = {
> 	/* Output controls */
> 	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x10, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("Speaker Playback Switch", 0x10, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Node 11 Playback Volume", 0x11, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Node 11 Playback Switch", 0x11, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Node 12 Playback Volume", 0x12, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Node 12 Playback Switch", 0x12, 0x0, HDA_OUTPUT),
> 	
> 	/* Modes for retasking pin widgets */
> 	CXT_PIN_MODE("HP-OUT pin mode", 0x11, CXT_PIN_DIR_INOUT),
>@@ -742,25 +783,17 @@ static struct snd_kcontrol_new cxt5045_test_mixer[] = {
> 	CXT_EAPD_SWITCH("External Amplifier", 0x10, 0x0),
> 
> 	/* Loopback mixer controls */
>-	HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x17, 0x01, HDA_INPUT),
>-	HDA_CODEC_MUTE("MIC1 Playback Switch", 0x17, 0x01, HDA_INPUT),
>-	HDA_CODEC_VOLUME("LINE loopback Playback Volume", 0x17, 0x02, HDA_INPUT),
>-	HDA_CODEC_MUTE("LINE loopback Playback Switch", 0x17, 0x02, HDA_INPUT),
>-	HDA_CODEC_VOLUME("HP-OUT loopback Playback Volume", 0x17, 0x03, HDA_INPUT),
>-	HDA_CODEC_MUTE("HP-OUT loopback Playback Switch", 0x17, 0x03, HDA_INPUT),
>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x04, HDA_INPUT),
>-	HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x04, HDA_INPUT),
>-
>-	HDA_CODEC_VOLUME("Capture-1 Volume", 0x17, 0x0, HDA_INPUT),
>-	HDA_CODEC_MUTE("Capture-1 Switch", 0x17, 0x0, HDA_INPUT),
>-	HDA_CODEC_VOLUME("Capture-2 Volume", 0x17, 0x1, HDA_INPUT),
>-	HDA_CODEC_MUTE("Capture-2 Switch", 0x17, 0x1, HDA_INPUT),
>-	HDA_CODEC_VOLUME("Capture-3 Volume", 0x17, 0x2, HDA_INPUT),
>-	HDA_CODEC_MUTE("Capture-3 Switch", 0x17, 0x2, HDA_INPUT),
>-	HDA_CODEC_VOLUME("Capture-4 Volume", 0x17, 0x3, HDA_INPUT),
>-	HDA_CODEC_MUTE("Capture-4 Switch", 0x17, 0x3, HDA_INPUT),
>-	HDA_CODEC_VOLUME("Capture-5 Volume", 0x17, 0x4, HDA_INPUT),
>-	HDA_CODEC_MUTE("Capture-5 Switch", 0x17, 0x4, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("Mixer-1 Volume", 0x17, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mixer-1 Switch", 0x17, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mixer-2 Volume", 0x17, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mixer-2 Switch", 0x17, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mixer-3 Volume", 0x17, 0x2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mixer-3 Switch", 0x17, 0x2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mixer-4 Volume", 0x17, 0x3, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mixer-4 Switch", 0x17, 0x3, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mixer-5 Volume", 0x17, 0x4, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mixer-5 Switch", 0x17, 0x4, HDA_INPUT),
> 	{
> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
> 		.name = "Input Source",
>@@ -768,14 +801,28 @@ static struct snd_kcontrol_new cxt5045_test_mixer[] = {
> 		.get = conexant_mux_enum_get,
> 		.put = conexant_mux_enum_put,
> 	},
>-
>+	/* Audio input controls */
>+	HDA_CODEC_VOLUME("Input-1 Volume", 0x1a, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Input-1 Switch", 0x1a, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Input-2 Volume", 0x1a, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Input-2 Switch", 0x1a, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Input-3 Volume", 0x1a, 0x2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Input-3 Switch", 0x1a, 0x2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Input-4 Volume", 0x1a, 0x3, HDA_INPUT),
>+	HDA_CODEC_MUTE("Input-4 Switch", 0x1a, 0x3, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Input-5 Volume", 0x1a, 0x4, HDA_INPUT),
>+	HDA_CODEC_MUTE("Input-5 Switch", 0x1a, 0x4, HDA_INPUT),
> 	{ } /* end */
> };
> 
> static struct hda_verb cxt5045_test_init_verbs[] = {
>+	/* Set connections */
>+	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 },
>+	{ 0x11, AC_VERB_SET_CONNECT_SEL, 0x0 },
>+	{ 0x12, AC_VERB_SET_CONNECT_SEL, 0x0 },
> 	/* Enable retasking pins as output, initially without power amp */
> 	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
> 
> 	/* Disable digital (SPDIF) pins initially, but users can enable
> 	 * them via a mixer switch.  In the case of SPDIF-out, this initverb
>@@ -783,7 +830,8 @@ static struct hda_verb cxt5045_test_init_verbs[] = {
> 	 * PCM format, copyright asserted, no pre-emphasis and no validity
> 	 * control.
> 	 */
>-	{0x13, AC_VERB_SET_DIGI_CONVERT_1, 0},
>+	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x18, AC_VERB_SET_DIGI_CONVERT_1, 0},
> 
> 	/* Start with output sum widgets muted and their output gains at min */
> 	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>@@ -804,6 +852,7 @@ static struct hda_verb cxt5045_test_init_verbs[] = {
> 	 * pin)
> 	 */
> 	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x17, AC_VERB_SET_CONNECT_SEL, 0x00},
> 
> 	/* Mute all inputs to mixer widget (even unconnected ones) */
> 	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* Mixer pin */
>@@ -827,7 +876,11 @@ static int cxt5045_init(struct hda_codec *codec)
> 
> 
> enum {
>-	CXT5045_LAPTOP,	/* Laptops w/ EAPD support */
>+	CXT5045_LAPTOP_HPSENSE,
>+	CXT5045_LAPTOP_MICSENSE,
>+	CXT5045_LAPTOP_HPMICSENSE,
>+	CXT5045_BENQ,
>+	CXT5045_LAPTOP_HP530,
> #ifdef CONFIG_SND_DEBUG
> 	CXT5045_TEST,
> #endif
>@@ -835,16 +888,36 @@ enum {
> };
> 
> static const char *cxt5045_models[CXT5045_MODELS] = {
>-	[CXT5045_LAPTOP]	= "laptop",
>+	[CXT5045_LAPTOP_HPSENSE]	= "laptop-hpsense",
>+	[CXT5045_LAPTOP_MICSENSE]	= "laptop-micsense",
>+	[CXT5045_LAPTOP_HPMICSENSE]	= "laptop-hpmicsense",
>+	[CXT5045_BENQ]			= "benq",
>+	[CXT5045_LAPTOP_HP530]		= "laptop-hp530",
> #ifdef CONFIG_SND_DEBUG
> 	[CXT5045_TEST]		= "test",
> #endif
> };
> 
> static struct snd_pci_quirk cxt5045_cfg_tbl[] = {
>-	SND_PCI_QUIRK(0x103c, 0x30b7, "HP DV6000Z", CXT5045_LAPTOP),
>-	SND_PCI_QUIRK(0x103c, 0x30bb, "HP DV8000", CXT5045_LAPTOP),
>-	SND_PCI_QUIRK(0x1734, 0x10ad, "Fujitsu Si1520", CXT5045_LAPTOP),
>+	SND_PCI_QUIRK(0x103c, 0x30a5, "HP", CXT5045_LAPTOP_HPSENSE),
>+	SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV Series", CXT5045_LAPTOP_HPSENSE),
>+	SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2120", CXT5045_LAPTOP_HPSENSE),
>+	SND_PCI_QUIRK(0x103c, 0x30b7, "HP DV6000Z", CXT5045_LAPTOP_HPSENSE),
>+	SND_PCI_QUIRK(0x103c, 0x30bb, "HP DV8000", CXT5045_LAPTOP_HPSENSE),
>+	SND_PCI_QUIRK(0x103c, 0x30cd, "HP DV Series", CXT5045_LAPTOP_HPSENSE),
>+	SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV9533EG", CXT5045_LAPTOP_HPSENSE),
>+	SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT5045_LAPTOP_HP530),
>+	SND_PCI_QUIRK(0x103c, 0x30d9, "HP Spartan", CXT5045_LAPTOP_HPSENSE),
>+	SND_PCI_QUIRK(0x152d, 0x0753, "Benq R55E", CXT5045_BENQ),
>+	SND_PCI_QUIRK(0x1734, 0x10ad, "Fujitsu Si1520", CXT5045_LAPTOP_MICSENSE),
>+	SND_PCI_QUIRK(0x1734, 0x10cb, "Fujitsu Si3515", CXT5045_LAPTOP_HPMICSENSE),
>+	SND_PCI_QUIRK(0x1734, 0x110e, "Fujitsu V5505", CXT5045_LAPTOP_HPSENSE),
>+	SND_PCI_QUIRK(0x1509, 0x1e40, "FIC", CXT5045_LAPTOP_HPMICSENSE),
>+	SND_PCI_QUIRK(0x1509, 0x2f05, "FIC", CXT5045_LAPTOP_HPMICSENSE),
>+	SND_PCI_QUIRK(0x1509, 0x2f06, "FIC", CXT5045_LAPTOP_HPMICSENSE),
>+	SND_PCI_QUIRK(0x1631, 0xc106, "Packard Bell", CXT5045_LAPTOP_HPMICSENSE),
>+	SND_PCI_QUIRK(0x1631, 0xc107, "Packard Bell", CXT5045_LAPTOP_HPMICSENSE),
>+	SND_PCI_QUIRK(0x8086, 0x2111, "Conexant Reference board", CXT5045_LAPTOP_HPSENSE),
> 	{}
> };
> 
>@@ -877,26 +950,74 @@ static int patch_cxt5045(struct hda_codec *codec)
> 
> 
> 	codec->patch_ops = conexant_patch_ops;
>-	codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
> 
> 	board_config = snd_hda_check_board_config(codec, CXT5045_MODELS,
> 						  cxt5045_models,
> 						  cxt5045_cfg_tbl);
> 	switch (board_config) {
>-	case CXT5045_LAPTOP:
>+	case CXT5045_LAPTOP_HPSENSE:
>+		codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
> 		spec->input_mux = &cxt5045_capture_source;
> 		spec->num_init_verbs = 2;
>-		spec->init_verbs[1] = cxt5045_init_verbs;
>+		spec->init_verbs[1] = cxt5045_hp_sense_init_verbs;
> 		spec->mixers[0] = cxt5045_mixers;
> 		codec->patch_ops.init = cxt5045_init;
> 		break;
>+	case CXT5045_LAPTOP_MICSENSE:
>+		spec->input_mux = &cxt5045_capture_source;
>+		spec->num_init_verbs = 2;
>+		spec->init_verbs[1] = cxt5045_mic_sense_init_verbs;
>+		spec->mixers[0] = cxt5045_mixers;
>+		codec->patch_ops.init = cxt5045_init;
>+		break;
>+	default:
>+	case CXT5045_LAPTOP_HPMICSENSE:
>+		codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
>+		spec->input_mux = &cxt5045_capture_source;
>+		spec->num_init_verbs = 3;
>+		spec->init_verbs[1] = cxt5045_hp_sense_init_verbs;
>+		spec->init_verbs[2] = cxt5045_mic_sense_init_verbs;
>+		spec->mixers[0] = cxt5045_mixers;
>+		codec->patch_ops.init = cxt5045_init;
>+		break;
>+	case CXT5045_BENQ:
>+		codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
>+		spec->input_mux = &cxt5045_capture_source_benq;
>+		spec->num_init_verbs = 1;
>+		spec->init_verbs[0] = cxt5045_benq_init_verbs;
>+		spec->mixers[0] = cxt5045_mixers;
>+		spec->mixers[1] = cxt5045_benq_mixers;
>+		spec->num_mixers = 2;
>+		codec->patch_ops.init = cxt5045_init;
>+		break;
>+	case CXT5045_LAPTOP_HP530:
>+		codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
>+		spec->input_mux = &cxt5045_capture_source_hp530;
>+		spec->num_init_verbs = 2;
>+		spec->init_verbs[1] = cxt5045_hp_sense_init_verbs;
>+		spec->mixers[0] = cxt5045_mixers_hp530;
>+		codec->patch_ops.init = cxt5045_init;
>+		break;
> #ifdef CONFIG_SND_DEBUG
> 	case CXT5045_TEST:
> 		spec->input_mux = &cxt5045_test_capture_source;
> 		spec->mixers[0] = cxt5045_test_mixer;
> 		spec->init_verbs[0] = cxt5045_test_init_verbs;
>+		break;
>+		
> #endif	
> 	}
>+
>+	/*
>+	 * Fix max PCM level to 0 dB
>+	 * (originall it has 0x2b steps with 0dB offset 0x14)
>+	 */
>+	snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,
>+				  (0x14 << AC_AMPCAP_OFFSET_SHIFT) |
>+				  (0x14 << AC_AMPCAP_NUM_STEPS_SHIFT) |
>+				  (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |
>+				  (1 << AC_AMPCAP_MUTE_SHIFT));
>+
> 	return 0;
> }
> 
>@@ -913,10 +1034,9 @@ static struct hda_channel_mode cxt5047_modes[1] = {
> };
> 
> static struct hda_input_mux cxt5047_capture_source = {
>-	.num_items = 2,
>+	.num_items = 1,
> 	.items = {
>-		{ "ExtMic", 0x0 },
>-		{ "IntMic", 0x1 },
>+		{ "Mic", 0x2 },
> 	}
> };
> 
>@@ -949,36 +1069,44 @@ static int cxt5047_hp_master_sw_put(struct snd_kcontrol *kcontrol,
> 	/* toggle internal speakers mute depending of presence of
> 	 * the headphone jack
> 	 */
>-	bits = (!spec->hp_present && spec->cur_eapd) ? 0 : 0x80;
>-	snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits);
>-	snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits);
>-	bits = spec->cur_eapd ? 0 : 0x80;
>-	snd_hda_codec_amp_update(codec, 0x13, 0, HDA_OUTPUT, 0, 0x80, bits);
>-	snd_hda_codec_amp_update(codec, 0x13, 1, HDA_OUTPUT, 0, 0x80, bits);
>+	bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE;
>+	snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+	bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE;
>+	snd_hda_codec_amp_stereo(codec, 0x13, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
> 	return 1;
> }
> 
> /* bind volumes of both NID 0x13 (Headphones) and 0x1d (Speakers) */
>-static int cxt5047_hp_master_vol_put(struct snd_kcontrol *kcontrol,
>-				     struct snd_ctl_elem_value *ucontrol)
>+static struct hda_bind_ctls cxt5047_bind_master_vol = {
>+	.ops = &snd_hda_bind_vol,
>+	.values = {
>+		HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
>+		HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),
>+		0
>+	},
>+};
>+
>+/* mute internal speaker if HP is plugged */
>+static void cxt5047_hp_automute(struct hda_codec *codec)
> {
>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>-	long *valp = ucontrol->value.integer.value;
>-	int change;
>-
>-	change = snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0,
>-					  0x7f, valp[0] & 0x7f);
>-	change |= snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0,
>-					   0x7f, valp[1] & 0x7f);
>-	snd_hda_codec_amp_update(codec, 0x13, 0, HDA_OUTPUT, 0,
>-				 0x7f, valp[0] & 0x7f);
>-	snd_hda_codec_amp_update(codec, 0x13, 1, HDA_OUTPUT, 0,
>-				 0x7f, valp[1] & 0x7f);
>-	return change;
>+	struct conexant_spec *spec = codec->spec;
>+	unsigned int bits;
>+
>+	spec->hp_present = snd_hda_codec_read(codec, 0x13, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+
>+	bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+	/* Mute/Unmute PCM 2 for good measure - some systems need this */
>+	snd_hda_codec_amp_stereo(codec, 0x1c, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
> }
> 
> /* mute internal speaker if HP is plugged */
>-static void cxt5047_hp_automute(struct hda_codec *codec)
>+static void cxt5047_hp2_automute(struct hda_codec *codec)
> {
> 	struct conexant_spec *spec = codec->spec;
> 	unsigned int bits;
>@@ -986,30 +1114,30 @@ static void cxt5047_hp_automute(struct hda_codec *codec)
> 	spec->hp_present = snd_hda_codec_read(codec, 0x13, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
> 
>-	bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0;
>-	snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits);
>-	snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits);
>+	bits = spec->hp_present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
> 	/* Mute/Unmute PCM 2 for good measure - some systems need this */
>-	snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, 0x80, bits);
>-	snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0x80, bits);
>+	snd_hda_codec_amp_stereo(codec, 0x1c, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
> }
> 
> /* toggle input of built-in and mic jack appropriately */
> static void cxt5047_hp_automic(struct hda_codec *codec)
> {
> 	static struct hda_verb mic_jack_on[] = {
>-		{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
>-		{0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
>+		{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+		{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
> 		{}
> 	};
> 	static struct hda_verb mic_jack_off[] = {
>-		{0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
>-		{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
>+		{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+		{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
> 		{}
> 	};
> 	unsigned int present;
> 
>-	present = snd_hda_codec_read(codec, 0x08, 0,
>+	present = snd_hda_codec_read(codec, 0x15, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
> 	if (present)
> 		snd_hda_sequence_write(codec, mic_jack_on);
>@@ -1021,10 +1149,24 @@ static void cxt5047_hp_automic(struct hda_codec *codec)
> static void cxt5047_hp_unsol_event(struct hda_codec *codec,
> 				  unsigned int res)
> {
>+	switch (res >> 26) {
>+	case CONEXANT_HP_EVENT:
>+		cxt5047_hp_automute(codec);
>+		break;
>+	case CONEXANT_MIC_EVENT:
>+		cxt5047_hp_automic(codec);
>+		break;
>+	}
>+}
>+
>+/* unsolicited event for HP jack sensing - non-EAPD systems */
>+static void cxt5047_hp2_unsol_event(struct hda_codec *codec,
>+				  unsigned int res)
>+{
> 	res >>= 26;
> 	switch (res) {
> 	case CONEXANT_HP_EVENT:
>-		cxt5047_hp_automute(codec);
>+		cxt5047_hp2_automute(codec);
> 		break;
> 	case CONEXANT_MIC_EVENT:
> 		cxt5047_hp_automic(codec);
>@@ -1033,37 +1175,20 @@ static void cxt5047_hp_unsol_event(struct hda_codec *codec,
> }
> 
> static struct snd_kcontrol_new cxt5047_mixers[] = {
>-	{
>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Capture Source",
>-		.info = conexant_mux_enum_info,
>-		.get = conexant_mux_enum_get,
>-		.put = conexant_mux_enum_put
>-	},
> 	HDA_CODEC_VOLUME("Mic Bypass Capture Volume", 0x19, 0x02, HDA_INPUT),
> 	HDA_CODEC_MUTE("Mic Bypass Capture Switch", 0x19, 0x02, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Gain Volume", 0x1a, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Mic Gain Switch", 0x1a, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x03, HDA_INPUT),
> 	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT),
> 	HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),
> 	HDA_CODEC_VOLUME("PCM-2 Volume", 0x1c, 0x00, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("PCM-2 Switch", 0x1c, 0x00, HDA_OUTPUT),
>-	{
>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Master Playback Volume",
>-		.info = snd_hda_mixer_amp_volume_info,
>-		.get = snd_hda_mixer_amp_volume_get,
>-		.put = cxt5047_hp_master_vol_put,
>-		.private_value = HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
>-	},
>-	{
>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Master Playback Switch",
>-		.info = cxt_eapd_info,
>-		.get = cxt_eapd_get,
>-		.put = cxt5047_hp_master_sw_put,
>-		.private_value = 0x13,
>-	},
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x00, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x1d, 0x00, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x13, 0x00, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x13, 0x00, HDA_OUTPUT),
> 
> 	{}
> };
>@@ -1082,14 +1207,7 @@ static struct snd_kcontrol_new cxt5047_toshiba_mixers[] = {
> 	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT),
> 	HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),
>-	{
>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Master Playback Volume",
>-		.info = snd_hda_mixer_amp_volume_info,
>-		.get = snd_hda_mixer_amp_volume_get,
>-		.put = cxt5047_hp_master_vol_put,
>-		.private_value = HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
>-	},
>+	HDA_BIND_VOL("Master Playback Volume", &cxt5047_bind_master_vol),
> 	{
> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
> 		.name = "Master Playback Switch",
>@@ -1133,18 +1251,19 @@ static struct hda_verb cxt5047_init_verbs[] = {
> 	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
> 	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },
> 	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },
>-	/* HP, Amp, Speaker  */
>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>-	{0x1A, AC_VERB_SET_CONNECT_SEL,0x00},
>-	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE,
>-	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x00},
>-	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE,
>-	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x03},
>+	/* HP, Speaker  */
>+	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
>+	{0x13, AC_VERB_SET_CONNECT_SEL,0x1},
> 	{0x1d, AC_VERB_SET_CONNECT_SEL,0x0},
>-	/* Record selector: Front mic */
>+	/* Record selector: Mic */
> 	{0x12, AC_VERB_SET_CONNECT_SEL,0x03},
> 	{0x19, AC_VERB_SET_AMP_GAIN_MUTE,
> 	 AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
>+	{0x1A, AC_VERB_SET_CONNECT_SEL,0x02},
>+	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE,
>+	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x00},
>+	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE,
>+	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x03},
> 	/* SPDIF route: PCM */
> 	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x0 },
> 	/* Enable unsolicited events */
>@@ -1161,8 +1280,6 @@ static struct hda_verb cxt5047_toshiba_init_verbs[] = {
> 	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},
> 	/* Speaker routing */
> 	{0x1d, AC_VERB_SET_CONNECT_SEL,0x1},
>-	/* Change default to ExtMic for recording */
>-	{0x1a, AC_VERB_SET_CONNECT_SEL,0x2},
> 	{}
> };
> 
>@@ -1170,9 +1287,13 @@ static struct hda_verb cxt5047_toshiba_init_verbs[] = {
> static struct hda_verb cxt5047_hp_init_verbs[] = {
> 	/* pin sensing on HP jack */
> 	{0x13, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
>+	/* 0x13 is actually shared by both HP and speaker;
>+	 * setting the connection to 0 (=0x19) makes the master volume control
>+	 * working mysteriouslly...
>+	 */
>+	{0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
> 	/* Record selector: Ext Mic */
> 	{0x12, AC_VERB_SET_CONNECT_SEL,0x03},
>-	{0x1a, AC_VERB_SET_CONNECT_SEL,0x02},
> 	{0x19, AC_VERB_SET_AMP_GAIN_MUTE,
> 	 AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
> 	/* Speaker routing */
>@@ -1242,13 +1363,16 @@ static struct snd_kcontrol_new cxt5047_test_mixer[] = {
> 		.get = conexant_mux_enum_get,
> 		.put = conexant_mux_enum_put,
> 	},
>-       /* Controls for GPIO pins, assuming they exist and are configured
>-	* as outputs
>-	*/
>-	CXT_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01),
>-	CXT_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02),
>-	CXT_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04),
>-	CXT_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08),
>+	HDA_CODEC_VOLUME("Input-1 Volume", 0x1a, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Input-1 Switch", 0x1a, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Input-2 Volume", 0x1a, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Input-2 Switch", 0x1a, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Input-3 Volume", 0x1a, 0x2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Input-3 Switch", 0x1a, 0x2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Input-4 Volume", 0x1a, 0x3, HDA_INPUT),
>+	HDA_CODEC_MUTE("Input-4 Switch", 0x1a, 0x3, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Input-5 Volume", 0x1a, 0x4, HDA_INPUT),
>+	HDA_CODEC_MUTE("Input-5 Switch", 0x1a, 0x4, HDA_INPUT),
> 
> 	{ } /* end */
> };
>@@ -1339,9 +1463,9 @@ static const char *cxt5047_models[CXT5047_MODELS] = {
> 
> static struct snd_pci_quirk cxt5047_cfg_tbl[] = {
> 	SND_PCI_QUIRK(0x103c, 0x30a0, "HP DV1000", CXT5047_LAPTOP),
>+	SND_PCI_QUIRK(0x103c, 0x30a5, "HP DV5200T/DV8000T", CXT5047_LAPTOP_HP),
> 	SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV2000T/DV3000T", CXT5047_LAPTOP),
> 	SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2000Z", CXT5047_LAPTOP),
>-	SND_PCI_QUIRK(0x103c, 0x30a5, "HP DV5200T/DV8000T", CXT5047_LAPTOP_HP),
> 	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P100", CXT5047_LAPTOP_EAPD),
> 	{}
> };
>@@ -1374,19 +1498,20 @@ static int patch_cxt5047(struct hda_codec *codec)
> 	spec->channel_mode = cxt5047_modes,
> 
> 	codec->patch_ops = conexant_patch_ops;
>-	codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
> 
> 	board_config = snd_hda_check_board_config(codec, CXT5047_MODELS,
> 						  cxt5047_models,
> 						  cxt5047_cfg_tbl);
> 	switch (board_config) {
> 	case CXT5047_LAPTOP:
>+		codec->patch_ops.unsol_event = cxt5047_hp2_unsol_event;
> 		break;
> 	case CXT5047_LAPTOP_HP:
> 		spec->input_mux = &cxt5047_hp_capture_source;
> 		spec->num_init_verbs = 2;
> 		spec->init_verbs[1] = cxt5047_hp_init_verbs;
> 		spec->mixers[0] = cxt5047_hp_mixers;
>+		codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
> 		codec->patch_ops.init = cxt5047_hp_init;
> 		break;
> 	case CXT5047_LAPTOP_EAPD:
>@@ -1394,21 +1519,273 @@ static int patch_cxt5047(struct hda_codec *codec)
> 		spec->num_init_verbs = 2;
> 		spec->init_verbs[1] = cxt5047_toshiba_init_verbs;
> 		spec->mixers[0] = cxt5047_toshiba_mixers;
>+		codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
> 		break;
> #ifdef CONFIG_SND_DEBUG
> 	case CXT5047_TEST:
> 		spec->input_mux = &cxt5047_test_capture_source;
> 		spec->mixers[0] = cxt5047_test_mixer;
> 		spec->init_verbs[0] = cxt5047_test_init_verbs;
>+		codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
> #endif	
> 	}
> 	return 0;
> }
> 
>+/* Conexant 5051 specific */
>+static hda_nid_t cxt5051_dac_nids[1] = { 0x10 };
>+static hda_nid_t cxt5051_adc_nids[2] = { 0x14, 0x15 };
>+#define CXT5051_SPDIF_OUT	0x1C
>+#define CXT5051_PORTB_EVENT	0x38
>+#define CXT5051_PORTC_EVENT	0x39
>+
>+static struct hda_channel_mode cxt5051_modes[1] = {
>+	{ 2, NULL },
>+};
>+
>+static void cxt5051_update_speaker(struct hda_codec *codec)
>+{
>+	struct conexant_spec *spec = codec->spec;
>+	unsigned int pinctl;
>+	pinctl = (!spec->hp_present && spec->cur_eapd) ? PIN_OUT : 0;
>+	snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
>+			    pinctl);
>+}
>+
>+/* turn on/off EAPD (+ mute HP) as a master switch */
>+static int cxt5051_hp_master_sw_put(struct snd_kcontrol *kcontrol,
>+				    struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>+
>+	if (!cxt_eapd_put(kcontrol, ucontrol))
>+		return 0;
>+	cxt5051_update_speaker(codec);
>+	return 1;
>+}
>+
>+/* toggle input of built-in and mic jack appropriately */
>+static void cxt5051_portb_automic(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x17, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) &
>+		AC_PINSENSE_PRESENCE;
>+	snd_hda_codec_write(codec, 0x14, 0,
>+			    AC_VERB_SET_CONNECT_SEL,
>+			    present ? 0x01 : 0x00);
>+}
>+
>+/* switch the current ADC according to the jack state */
>+static void cxt5051_portc_automic(struct hda_codec *codec)
>+{
>+	struct conexant_spec *spec = codec->spec;
>+	unsigned int present;
>+	hda_nid_t new_adc;
>+
>+	present = snd_hda_codec_read(codec, 0x18, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) &
>+		AC_PINSENSE_PRESENCE;
>+	if (present)
>+		spec->cur_adc_idx = 1;
>+	else
>+		spec->cur_adc_idx = 0;
>+	new_adc = spec->adc_nids[spec->cur_adc_idx];
>+	if (spec->cur_adc && spec->cur_adc != new_adc) {
>+		/* stream is running, let's swap the current ADC */
>+		snd_hda_codec_cleanup_stream(codec, spec->cur_adc);
>+		spec->cur_adc = new_adc;
>+		snd_hda_codec_setup_stream(codec, new_adc,
>+					   spec->cur_adc_stream_tag, 0,
>+					   spec->cur_adc_format);
>+	}
>+}
>+
>+/* mute internal speaker if HP is plugged */
>+static void cxt5051_hp_automute(struct hda_codec *codec)
>+{
>+	struct conexant_spec *spec = codec->spec;
>+
>+	spec->hp_present = snd_hda_codec_read(codec, 0x16, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) &
>+		AC_PINSENSE_PRESENCE;
>+	cxt5051_update_speaker(codec);
>+}
>+
>+/* unsolicited event for HP jack sensing */
>+static void cxt5051_hp_unsol_event(struct hda_codec *codec,
>+				   unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case CONEXANT_HP_EVENT:
>+		cxt5051_hp_automute(codec);
>+		break;
>+	case CXT5051_PORTB_EVENT:
>+		cxt5051_portb_automic(codec);
>+		break;
>+	case CXT5051_PORTC_EVENT:
>+		cxt5051_portc_automic(codec);
>+		break;
>+	}
>+}
>+
>+static struct snd_kcontrol_new cxt5051_mixers[] = {
>+	HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),
>+	HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),
>+	HDA_CODEC_VOLUME("External Mic Volume", 0x14, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("External Mic Switch", 0x14, 0x01, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Docking Mic Volume", 0x15, 0x00, HDA_INPUT),
>+	HDA_CODEC_MUTE("Docking Mic Switch", 0x15, 0x00, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Master Playback Switch",
>+		.info = cxt_eapd_info,
>+		.get = cxt_eapd_get,
>+		.put = cxt5051_hp_master_sw_put,
>+		.private_value = 0x1a,
>+	},
>+
>+	{}
>+};
>+
>+static struct snd_kcontrol_new cxt5051_hp_mixers[] = {
>+	HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),
>+	HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),
>+	HDA_CODEC_VOLUME("External Mic Volume", 0x15, 0x00, HDA_INPUT),
>+	HDA_CODEC_MUTE("External Mic Switch", 0x15, 0x00, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Master Playback Switch",
>+		.info = cxt_eapd_info,
>+		.get = cxt_eapd_get,
>+		.put = cxt5051_hp_master_sw_put,
>+		.private_value = 0x1a,
>+	},
>+
>+	{}
>+};
>+
>+static struct hda_verb cxt5051_init_verbs[] = {
>+	/* Line in, Mic */
>+	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
>+	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
>+	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
>+	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
>+	/* SPK  */
>+	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	/* HP, Amp  */
>+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	/* DAC1 */	
>+	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	/* Record selector: Int mic */
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44},
>+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},
>+	/* SPDIF route: PCM */
>+	{0x1c, AC_VERB_SET_CONNECT_SEL, 0x0},
>+	/* EAPD */
>+	{0x1a, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */ 
>+	{0x16, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},
>+	{0x17, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CXT5051_PORTB_EVENT},
>+	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CXT5051_PORTC_EVENT},
>+	{ } /* end */
>+};
>+
>+/* initialize jack-sensing, too */
>+static int cxt5051_init(struct hda_codec *codec)
>+{
>+	conexant_init(codec);
>+	if (codec->patch_ops.unsol_event) {
>+		cxt5051_hp_automute(codec);
>+		cxt5051_portb_automic(codec);
>+		cxt5051_portc_automic(codec);
>+	}
>+	return 0;
>+}
>+
>+
>+enum {
>+	CXT5051_LAPTOP,	 /* Laptops w/ EAPD support */
>+	CXT5051_HP,	/* no docking */
>+	CXT5051_MODELS
>+};
>+
>+static const char *cxt5051_models[CXT5051_MODELS] = {
>+	[CXT5051_LAPTOP]	= "laptop",
>+	[CXT5051_HP]		= "hp",
>+};
>+
>+static struct snd_pci_quirk cxt5051_cfg_tbl[] = {
>+	SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",
>+		      CXT5051_LAPTOP),
>+	SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP),
>+	{}
>+};
>+
>+static int patch_cxt5051(struct hda_codec *codec)
>+{
>+	struct conexant_spec *spec;
>+	int board_config;
>+
>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);
>+	if (!spec)
>+		return -ENOMEM;
>+	mutex_init(&spec->amp_mutex);
>+	codec->spec = spec;
>+
>+	codec->patch_ops = conexant_patch_ops;
>+	codec->patch_ops.init = cxt5051_init;
>+
>+	spec->multiout.max_channels = 2;
>+	spec->multiout.num_dacs = ARRAY_SIZE(cxt5051_dac_nids);
>+	spec->multiout.dac_nids = cxt5051_dac_nids;
>+	spec->multiout.dig_out_nid = CXT5051_SPDIF_OUT;
>+	spec->num_adc_nids = 1; /* not 2; via auto-mic switch */
>+	spec->adc_nids = cxt5051_adc_nids;
>+	spec->num_mixers = 1;
>+	spec->mixers[0] = cxt5051_mixers;
>+	spec->num_init_verbs = 1;
>+	spec->init_verbs[0] = cxt5051_init_verbs;
>+	spec->spdif_route = 0;
>+	spec->num_channel_mode = ARRAY_SIZE(cxt5051_modes);
>+	spec->channel_mode = cxt5051_modes;
>+	spec->cur_adc = 0;
>+	spec->cur_adc_idx = 0;
>+
>+	board_config = snd_hda_check_board_config(codec, CXT5051_MODELS,
>+						  cxt5051_models,
>+						  cxt5051_cfg_tbl);
>+	switch (board_config) {
>+	case CXT5051_HP:
>+		codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;
>+		spec->mixers[0] = cxt5051_hp_mixers;
>+		break;
>+	default:
>+	case CXT5051_LAPTOP:
>+		codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;
>+		break;
>+	}
>+
>+	return 0;
>+}
>+
>+
>+/*
>+ */
>+
> struct hda_codec_preset snd_hda_preset_conexant[] = {
> 	{ .id = 0x14f15045, .name = "CX20549 (Venice)",
> 	  .patch = patch_cxt5045 },
> 	{ .id = 0x14f15047, .name = "CX20551 (Waikiki)",
> 	  .patch = patch_cxt5047 },
>+	{ .id = 0x14f15051, .name = "CX20561 (Hermosa)",
>+	  .patch = patch_cxt5051 },
> 	{} /* terminator */
> };
>diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
>index 672df63..7613e37 100644
>--- a/sound/pci/hda/patch_realtek.c
>+++ b/sound/pci/hda/patch_realtek.c
>@@ -31,6 +31,7 @@
> #include <sound/core.h>
> #include "hda_codec.h"
> #include "hda_local.h"
>+#include "hda_patch.h"
> 
> #define ALC880_FRONT_EVENT		0x01
> #define ALC880_DCVOL_EVENT		0x02
>@@ -60,6 +61,7 @@ enum {
> 	ALC880_TCL_S700,
> 	ALC880_LG,
> 	ALC880_LG_LW,
>+	ALC880_MEDION_RIM,
> #ifdef CONFIG_SND_DEBUG
> 	ALC880_TEST,
> #endif
>@@ -74,6 +76,8 @@ enum {
> 	ALC260_HP_3013,
> 	ALC260_FUJITSU_S702X,
> 	ALC260_ACER,
>+	ALC260_WILL,
>+	ALC260_REPLACER_672V,
> #ifdef CONFIG_SND_DEBUG
> 	ALC260_TEST,
> #endif
>@@ -90,12 +94,39 @@ enum {
> 	ALC262_HP_BPC,
> 	ALC262_HP_BPC_D7000_WL,
> 	ALC262_HP_BPC_D7000_WF,
>+	ALC262_HP_TC_T5735,
> 	ALC262_HP_RP5700,
> 	ALC262_BENQ_ED8,
>+	ALC262_SONY_ASSAMD,
>+	ALC262_BENQ_T31,
>+	ALC262_ULTRA,
>+	ALC262_LENOVO_3000,
> 	ALC262_AUTO,
> 	ALC262_MODEL_LAST /* last tag */
> };
> 
>+/* ALC268 models */
>+enum {
>+	ALC267_QUANTA_IL1,
>+	ALC268_3ST,
>+	ALC268_TOSHIBA,
>+	ALC268_ACER,
>+	ALC268_DELL,
>+	ALC268_ZEPTO,
>+#ifdef CONFIG_SND_DEBUG
>+	ALC268_TEST,
>+#endif
>+	ALC268_AUTO,
>+	ALC268_MODEL_LAST /* last tag */
>+};
>+
>+/* ALC269 models */
>+enum {
>+	ALC269_BASIC,
>+	ALC269_AUTO,
>+	ALC269_MODEL_LAST /* last tag */
>+};
>+
> /* ALC861 models */
> enum {
> 	ALC861_3ST,
>@@ -113,20 +144,47 @@ enum {
> /* ALC861-VD models */
> enum {
> 	ALC660VD_3ST,
>+	ALC660VD_3ST_DIG,
> 	ALC861VD_3ST,
> 	ALC861VD_3ST_DIG,
> 	ALC861VD_6ST_DIG,
>+	ALC861VD_LENOVO,
>+	ALC861VD_DALLAS,
>+	ALC861VD_HP,
> 	ALC861VD_AUTO,
> 	ALC861VD_MODEL_LAST,
> };
> 
>+/* ALC662 models */
>+enum {
>+	ALC662_3ST_2ch_DIG,
>+	ALC662_3ST_6ch_DIG,
>+	ALC662_3ST_6ch,
>+	ALC662_5ST_DIG,
>+	ALC662_LENOVO_101E,
>+	ALC662_ASUS_EEEPC_P701,
>+	ALC662_ASUS_EEEPC_EP20,
>+	ALC663_ASUS_M51VA,
>+	ALC663_ASUS_G71V,
>+	ALC663_ASUS_H13,
>+	ALC663_ASUS_G50V,
>+	ALC662_AUTO,
>+	ALC662_MODEL_LAST,
>+};
>+
> /* ALC882 models */
> enum {
> 	ALC882_3ST_DIG,
> 	ALC882_6ST_DIG,
> 	ALC882_ARIMA,
>-	ALC882_AUTO,
>+	ALC882_W2JC,
>+	ALC882_TARGA,
>+	ALC882_ASUS_A7J,
>+	ALC882_ASUS_A7M,
> 	ALC885_MACPRO,
>+	ALC885_MBP3,
>+	ALC885_IMAC24,
>+	ALC882_AUTO,
> 	ALC882_MODEL_LAST,
> };
> 
>@@ -139,10 +197,20 @@ enum {
> 	ALC883_TARGA_DIG,
> 	ALC883_TARGA_2ch_DIG,
> 	ALC883_ACER,
>+	ALC883_ACER_ASPIRE,
> 	ALC883_MEDION,
>+	ALC883_MEDION_MD2,	
> 	ALC883_LAPTOP_EAPD,
>-	ALC888_6ST_HP,
>+	ALC883_LENOVO_101E_2ch,
>+	ALC883_LENOVO_NB0763,
>+	ALC888_LENOVO_MS7195_DIG,
>+	ALC883_HAIER_W66,		
> 	ALC888_3ST_HP,
>+	ALC888_6ST_DELL,
>+	ALC883_MITAC,
>+	ALC883_CLEVO_M720,
>+	ALC883_FUJITSU_PI2515,
>+	ALC883_3ST_6ch_INTEL,
> 	ALC883_AUTO,
> 	ALC883_MODEL_LAST,
> };
>@@ -164,8 +232,10 @@ struct alc_spec {
> 	char *stream_name_analog;	/* analog PCM stream */
> 	struct hda_pcm_stream *stream_analog_playback;
> 	struct hda_pcm_stream *stream_analog_capture;
>+	struct hda_pcm_stream *stream_analog_alt_playback;
>+	struct hda_pcm_stream *stream_analog_alt_capture;
> 
>-	char *stream_name_digital;	/* digital PCM stream */ 
>+	char *stream_name_digital;	/* digital PCM stream */
> 	struct hda_pcm_stream *stream_digital_playback;
> 	struct hda_pcm_stream *stream_digital_capture;
> 
>@@ -174,10 +244,12 @@ struct alc_spec {
> 					 * max_channels, dacs must be set
> 					 * dig_out_nid and hp_nid are optional
> 					 */
>+	hda_nid_t alt_dac_nid;
> 
> 	/* capture */
> 	unsigned int num_adc_nids;
> 	hda_nid_t *adc_nids;
>+	hda_nid_t *capsrc_nids;
> 	hda_nid_t dig_in_nid;		/* digital-in NID; optional */
> 
> 	/* capture source */
>@@ -198,7 +270,7 @@ struct alc_spec {
> 	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];
>+	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
> 
> 	/* hooks */
> 	void (*init_hook)(struct hda_codec *codec);
>@@ -207,6 +279,17 @@ struct alc_spec {
> 	/* for pin sensing */
> 	unsigned int sense_updated: 1;
> 	unsigned int jack_present: 1;
>+	unsigned int master_sw: 1;
>+
>+	/* for virtual master */
>+	hda_nid_t vmaster_nid;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	struct hda_loopback_check loopback;
>+#endif
>+
>+	/* for PLL fix */
>+	hda_nid_t pll_nid;
>+	unsigned int pll_coef_idx, pll_coef_bit;
> };
> 
> /*
>@@ -223,6 +306,7 @@ struct alc_config_preset {
> 	hda_nid_t hp_nid;		/* optional */
> 	unsigned int num_adc_nids;
> 	hda_nid_t *adc_nids;
>+	hda_nid_t *capsrc_nids;
> 	hda_nid_t dig_in_nid;
> 	unsigned int num_channel_mode;
> 	const struct hda_channel_mode *channel_mode;
>@@ -231,6 +315,9 @@ struct alc_config_preset {
> 	const struct hda_input_mux *input_mux;
> 	void (*unsol_event)(struct hda_codec *, unsigned int);
> 	void (*init_hook)(struct hda_codec *);
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	struct hda_amp_list *loopbacks;
>+#endif
> };
> 
> 
>@@ -266,9 +353,10 @@ static int alc_mux_enum_put(struct snd_kcontrol *kcontrol,
> 	struct alc_spec *spec = codec->spec;
> 	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
> 	unsigned int mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;
>+	hda_nid_t nid = spec->capsrc_nids ?
>+		spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx];
> 	return snd_hda_input_mux_put(codec, &spec->input_mux[mux_idx], ucontrol,
>-				     spec->adc_nids[adc_idx],
>-				     &spec->cur_mux[adc_idx]);
>+				     nid, &spec->cur_mux[adc_idx]);
> }
> 
> 
>@@ -403,14 +491,15 @@ static int alc_pin_mode_put(struct snd_kcontrol *kcontrol,
> 						 AC_VERB_GET_PIN_WIDGET_CONTROL,
> 						 0x00);
> 
>-	if (val < alc_pin_mode_min(dir) || val > alc_pin_mode_max(dir)) 
>+	if (val < alc_pin_mode_min(dir) || val > alc_pin_mode_max(dir))
> 		val = alc_pin_mode_min(dir);
> 
> 	change = pinctl != alc_pin_mode_values[val];
> 	if (change) {
> 		/* Set pin mode to that requested */
>-		snd_hda_codec_write(codec,nid,0,AC_VERB_SET_PIN_WIDGET_CONTROL,
>-				    alc_pin_mode_values[val]);
>+		snd_hda_codec_write_cache(codec, nid, 0,
>+					  AC_VERB_SET_PIN_WIDGET_CONTROL,
>+					  alc_pin_mode_values[val]);
> 
> 		/* Also enable the retasking pin's input/output as required 
> 		 * for the requested pin mode.  Enum values of 2 or less are
>@@ -423,19 +512,15 @@ static int alc_pin_mode_put(struct snd_kcontrol *kcontrol,
> 		 * this turns out to be necessary in the future.
> 		 */
> 		if (val <= 2) {
>-			snd_hda_codec_write(codec, nid, 0,
>-					    AC_VERB_SET_AMP_GAIN_MUTE,
>-					    AMP_OUT_MUTE);
>-			snd_hda_codec_write(codec, nid, 0,
>-					    AC_VERB_SET_AMP_GAIN_MUTE,
>-					    AMP_IN_UNMUTE(0));
>+			snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
>+						 HDA_AMP_MUTE, HDA_AMP_MUTE);
>+			snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, 0,
>+						 HDA_AMP_MUTE, 0);
> 		} else {
>-			snd_hda_codec_write(codec, nid, 0,
>-					    AC_VERB_SET_AMP_GAIN_MUTE,
>-					    AMP_IN_MUTE(0));
>-			snd_hda_codec_write(codec, nid, 0,
>-					    AC_VERB_SET_AMP_GAIN_MUTE,
>-					    AMP_OUT_UNMUTE);
>+			snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, 0,
>+						 HDA_AMP_MUTE, HDA_AMP_MUTE);
>+			snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
>+						 HDA_AMP_MUTE, 0);
> 		}
> 	}
> 	return change;
>@@ -454,15 +539,8 @@ static int alc_pin_mode_put(struct snd_kcontrol *kcontrol,
>  * needed for any "production" models.
>  */
> #ifdef CONFIG_SND_DEBUG
>-static int alc_gpio_data_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;
>-}                                
>+#define alc_gpio_data_info	snd_ctl_boolean_mono_info
>+
> static int alc_gpio_data_get(struct snd_kcontrol *kcontrol,
> 			     struct snd_ctl_elem_value *ucontrol)
> {
>@@ -494,7 +572,8 @@ static int alc_gpio_data_put(struct snd_kcontrol *kcontrol,
> 		gpio_data &= ~mask;
> 	else
> 		gpio_data |= mask;
>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_GPIO_DATA, gpio_data);
>+	snd_hda_codec_write_cache(codec, nid, 0,
>+				  AC_VERB_SET_GPIO_DATA, gpio_data);
> 
> 	return change;
> }
>@@ -514,15 +593,8 @@ static int alc_gpio_data_put(struct snd_kcontrol *kcontrol,
>  * necessary.
>  */
> #ifdef CONFIG_SND_DEBUG
>-static int alc_spdif_ctrl_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;
>-}                                
>+#define alc_spdif_ctrl_info	snd_ctl_boolean_mono_info
>+
> static int alc_spdif_ctrl_get(struct snd_kcontrol *kcontrol,
> 			      struct snd_ctl_elem_value *ucontrol)
> {
>@@ -531,7 +603,7 @@ static int alc_spdif_ctrl_get(struct snd_kcontrol *kcontrol,
> 	unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
> 	long *valp = ucontrol->value.integer.value;
> 	unsigned int val = snd_hda_codec_read(codec, nid, 0,
>-					      AC_VERB_GET_DIGI_CONVERT, 0x00);
>+					      AC_VERB_GET_DIGI_CONVERT_1, 0x00);
> 
> 	*valp = (val & mask) != 0;
> 	return 0;
>@@ -545,7 +617,7 @@ static int alc_spdif_ctrl_put(struct snd_kcontrol *kcontrol,
> 	unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
> 	long val = *ucontrol->value.integer.value;
> 	unsigned int ctrl_data = snd_hda_codec_read(codec, nid, 0,
>-						    AC_VERB_GET_DIGI_CONVERT,
>+						    AC_VERB_GET_DIGI_CONVERT_1,
> 						    0x00);
> 
> 	/* Set/unset the masked control bit(s) as needed */
>@@ -554,8 +626,8 @@ static int alc_spdif_ctrl_put(struct snd_kcontrol *kcontrol,
> 		ctrl_data &= ~mask;
> 	else
> 		ctrl_data |= mask;
>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
>-			    ctrl_data);
>+	snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
>+				  ctrl_data);
> 
> 	return change;
> }
>@@ -567,6 +639,59 @@ static int alc_spdif_ctrl_put(struct snd_kcontrol *kcontrol,
> 	  .private_value = nid | (mask<<16) }
> #endif   /* CONFIG_SND_DEBUG */
> 
>+/* A switch control to allow the enabling EAPD digital outputs on the ALC26x.
>+ * Again, this is only used in the ALC26x test models to help identify when
>+ * the EAPD line must be asserted for features to work.
>+ */
>+#ifdef CONFIG_SND_DEBUG
>+#define alc_eapd_ctrl_info	snd_ctl_boolean_mono_info
>+
>+static int alc_eapd_ctrl_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;
>+	unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
>+	long *valp = ucontrol->value.integer.value;
>+	unsigned int val = snd_hda_codec_read(codec, nid, 0,
>+					      AC_VERB_GET_EAPD_BTLENABLE, 0x00);
>+
>+	*valp = (val & mask) != 0;
>+	return 0;
>+}
>+
>+static int alc_eapd_ctrl_put(struct snd_kcontrol *kcontrol,
>+			      struct snd_ctl_elem_value *ucontrol)
>+{
>+	int change;
>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>+	hda_nid_t nid = kcontrol->private_value & 0xffff;
>+	unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
>+	long val = *ucontrol->value.integer.value;
>+	unsigned int ctrl_data = snd_hda_codec_read(codec, nid, 0,
>+						    AC_VERB_GET_EAPD_BTLENABLE,
>+						    0x00);
>+
>+	/* Set/unset the masked control bit(s) as needed */
>+	change = (!val ? 0 : mask) != (ctrl_data & mask);
>+	if (!val)
>+		ctrl_data &= ~mask;
>+	else
>+		ctrl_data |= mask;
>+	snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_EAPD_BTLENABLE,
>+				  ctrl_data);
>+
>+	return change;
>+}
>+
>+#define ALC_EAPD_CTRL_SWITCH(xname, nid, mask) \
>+	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
>+	  .info = alc_eapd_ctrl_info, \
>+	  .get = alc_eapd_ctrl_get, \
>+	  .put = alc_eapd_ctrl_put, \
>+	  .private_value = nid | (mask<<16) }
>+#endif   /* CONFIG_SND_DEBUG */
>+
> /*
>  * set up from the preset table
>  */
>@@ -594,16 +719,325 @@ static void setup_preset(struct alc_spec *spec,
> 	spec->multiout.hp_nid = preset->hp_nid;
> 	
> 	spec->num_mux_defs = preset->num_mux_defs;
>-	if (! spec->num_mux_defs)
>+	if (!spec->num_mux_defs)
> 		spec->num_mux_defs = 1;
> 	spec->input_mux = preset->input_mux;
> 
> 	spec->num_adc_nids = preset->num_adc_nids;
> 	spec->adc_nids = preset->adc_nids;
>+	spec->capsrc_nids = preset->capsrc_nids;
> 	spec->dig_in_nid = preset->dig_in_nid;
> 
> 	spec->unsol_event = preset->unsol_event;
> 	spec->init_hook = preset->init_hook;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = preset->loopbacks;
>+#endif
>+}
>+
>+/* Enable GPIO mask and set output */
>+static struct hda_verb alc_gpio1_init_verbs[] = {
>+	{0x01, AC_VERB_SET_GPIO_MASK, 0x01},
>+	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
>+	{0x01, AC_VERB_SET_GPIO_DATA, 0x01},
>+	{ }
>+};
>+
>+static struct hda_verb alc_gpio2_init_verbs[] = {
>+	{0x01, AC_VERB_SET_GPIO_MASK, 0x02},
>+	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},
>+	{0x01, AC_VERB_SET_GPIO_DATA, 0x02},
>+	{ }
>+};
>+
>+static struct hda_verb alc_gpio3_init_verbs[] = {
>+	{0x01, AC_VERB_SET_GPIO_MASK, 0x03},
>+	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03},
>+	{0x01, AC_VERB_SET_GPIO_DATA, 0x03},
>+	{ }
>+};
>+
>+/*
>+ * Fix hardware PLL issue
>+ * On some codecs, the analog PLL gating control must be off while
>+ * the default value is 1.
>+ */
>+static void alc_fix_pll(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	unsigned int val;
>+
>+	if (!spec->pll_nid)
>+		return;
>+	snd_hda_codec_write(codec, spec->pll_nid, 0, AC_VERB_SET_COEF_INDEX,
>+			    spec->pll_coef_idx);
>+	val = snd_hda_codec_read(codec, spec->pll_nid, 0,
>+				 AC_VERB_GET_PROC_COEF, 0);
>+	snd_hda_codec_write(codec, spec->pll_nid, 0, AC_VERB_SET_COEF_INDEX,
>+			    spec->pll_coef_idx);
>+	snd_hda_codec_write(codec, spec->pll_nid, 0, AC_VERB_SET_PROC_COEF,
>+			    val & ~(1 << spec->pll_coef_bit));
>+}
>+
>+static void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid,
>+			     unsigned int coef_idx, unsigned int coef_bit)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	spec->pll_nid = nid;
>+	spec->pll_coef_idx = coef_idx;
>+	spec->pll_coef_bit = coef_bit;
>+	alc_fix_pll(codec);
>+}
>+
>+static void alc_sku_automute(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	unsigned int present;
>+	unsigned int hp_nid = spec->autocfg.hp_pins[0];
>+	unsigned int sp_nid = spec->autocfg.speaker_pins[0];
>+
>+	/* need to execute and sync at first */
>+	snd_hda_codec_read(codec, hp_nid, 0, AC_VERB_SET_PIN_SENSE, 0);
>+	present = snd_hda_codec_read(codec, hp_nid, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0);
>+	spec->jack_present = (present & 0x80000000) != 0;
>+	snd_hda_codec_write(codec, sp_nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
>+			    spec->jack_present ? 0 : PIN_OUT);
>+}
>+
>+/* unsolicited event for HP jack sensing */
>+static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
>+{
>+	if (codec->vendor_id == 0x10ec0880)
>+		res >>= 28;
>+	else
>+		res >>= 26;
>+	if (res != ALC880_HP_EVENT)
>+		return;
>+
>+	alc_sku_automute(codec);
>+}
>+
>+/* additional initialization for ALC888 variants */
>+static void alc888_coef_init(struct hda_codec *codec)
>+{
>+	unsigned int tmp;
>+
>+	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 0);
>+	tmp = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_PROC_COEF, 0);
>+	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 7);
>+	if ((tmp & 0xf0) == 2)
>+		/* alc888S-VC */
>+		snd_hda_codec_read(codec, 0x20, 0,
>+				   AC_VERB_SET_PROC_COEF, 0x830);
>+	 else
>+		 /* alc888-VB */
>+		 snd_hda_codec_read(codec, 0x20, 0,
>+				    AC_VERB_SET_PROC_COEF, 0x3030);
>+}
>+
>+/* 32-bit subsystem ID for BIOS loading in HD Audio codec.
>+ *	31 ~ 16 :	Manufacture ID
>+ *	15 ~ 8	:	SKU ID
>+ *	7  ~ 0	:	Assembly ID
>+ *	port-A --> pin 39/41, port-E --> pin 14/15, port-D --> pin 35/36
>+ */
>+static void alc_subsystem_id(struct hda_codec *codec,
>+			     unsigned int porta, unsigned int porte,
>+			     unsigned int portd)
>+{
>+	unsigned int ass, tmp, i;
>+	unsigned nid;
>+	struct alc_spec *spec = codec->spec;
>+
>+	ass = codec->subsystem_id & 0xffff;
>+	if ((ass != codec->bus->pci->subsystem_device) && (ass & 1))
>+		goto do_sku;
>+
>+	/*	
>+	 * 31~30	: port conetcivity
>+	 * 29~21	: reserve
>+	 * 20		: PCBEEP input
>+	 * 19~16	: Check sum (15:1)
>+	 * 15~1		: Custom
>+	 * 0		: override
>+	*/
>+	nid = 0x1d;
>+	if (codec->vendor_id == 0x10ec0260)
>+		nid = 0x17;
>+	ass = snd_hda_codec_read(codec, nid, 0,
>+				 AC_VERB_GET_CONFIG_DEFAULT, 0);
>+	if (!(ass & 1) && !(ass & 0x100000))
>+		return;
>+	if ((ass >> 30) != 1)	/* no physical connection */
>+		return;
>+
>+	/* check sum */
>+	tmp = 0;
>+	for (i = 1; i < 16; i++) {
>+		if ((ass >> i) & 1)
>+			tmp++;
>+	}
>+	if (((ass >> 16) & 0xf) != tmp)
>+		return;
>+do_sku:
>+	/*
>+	 * 0 : override
>+	 * 1 :	Swap Jack
>+	 * 2 : 0 --> Desktop, 1 --> Laptop
>+	 * 3~5 : External Amplifier control
>+	 * 7~6 : Reserved
>+	*/
>+	tmp = (ass & 0x38) >> 3;	/* external Amp control */
>+	switch (tmp) {
>+	case 1:
>+		snd_hda_sequence_write(codec, alc_gpio1_init_verbs);
>+		break;
>+	case 3:
>+		snd_hda_sequence_write(codec, alc_gpio2_init_verbs);
>+		break;
>+	case 7:
>+		snd_hda_sequence_write(codec, alc_gpio3_init_verbs);
>+		break;
>+	case 5:	/* set EAPD output high */
>+		switch (codec->vendor_id) {
>+		case 0x10ec0260:
>+			snd_hda_codec_write(codec, 0x0f, 0,
>+					    AC_VERB_SET_EAPD_BTLENABLE, 2);
>+			snd_hda_codec_write(codec, 0x10, 0,
>+					    AC_VERB_SET_EAPD_BTLENABLE, 2);
>+			break;
>+		case 0x10ec0262:
>+		case 0x10ec0267:
>+		case 0x10ec0268:
>+		case 0x10ec0269:
>+		case 0x10ec0660:
>+		case 0x10ec0662:
>+		case 0x10ec0663:
>+		case 0x10ec0862:
>+		case 0x10ec0889:
>+			snd_hda_codec_write(codec, 0x14, 0,
>+					    AC_VERB_SET_EAPD_BTLENABLE, 2);
>+			snd_hda_codec_write(codec, 0x15, 0,
>+					    AC_VERB_SET_EAPD_BTLENABLE, 2);
>+			break;
>+		}
>+		switch (codec->vendor_id) {
>+		case 0x10ec0260:
>+			snd_hda_codec_write(codec, 0x1a, 0,
>+					    AC_VERB_SET_COEF_INDEX, 7);
>+			tmp = snd_hda_codec_read(codec, 0x1a, 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 | 0x2010);
>+			break;
>+		case 0x10ec0262:
>+		case 0x10ec0880:
>+		case 0x10ec0882:
>+		case 0x10ec0883:
>+		case 0x10ec0885:
>+		case 0x10ec0889:
>+			snd_hda_codec_write(codec, 0x20, 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, 0x20, 0,
>+					    AC_VERB_SET_COEF_INDEX, 7);	
>+			snd_hda_codec_write(codec, 0x20, 0,
>+					    AC_VERB_SET_PROC_COEF,
>+					    tmp | 0x2010);
>+			break;
>+		case 0x10ec0888:
>+			alc888_coef_init(codec);
>+			break;
>+		case 0x10ec0267:
>+		case 0x10ec0268:
>+			snd_hda_codec_write(codec, 0x20, 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, 0x20, 0,
>+					    AC_VERB_SET_COEF_INDEX, 7);	
>+			snd_hda_codec_write(codec, 0x20, 0,
>+					    AC_VERB_SET_PROC_COEF,
>+					    tmp | 0x3000);
>+			break;
>+		}
>+	default:
>+		break;
>+	}
>+	
>+	/* is laptop or Desktop and enable the function "Mute internal speaker
>+	 * when the external headphone out jack is plugged"
>+	 */
>+	if (!(ass & 0x8000))
>+		return;
>+	/*
>+	 * 10~8 : Jack location
>+	 * 12~11: Headphone out -> 00: PortA, 01: PortE, 02: PortD, 03: Resvered
>+	 * 14~13: Resvered
>+	 * 15   : 1 --> enable the function "Mute internal speaker
>+	 *	        when the external headphone out jack is plugged"
>+	 */
>+	if (!spec->autocfg.speaker_pins[0]) {
>+		if (spec->autocfg.line_out_pins[0])
>+			spec->autocfg.speaker_pins[0] =
>+				spec->autocfg.line_out_pins[0];
>+		else
>+			return;
>+	}
>+
>+	if (!spec->autocfg.hp_pins[0]) {
>+		tmp = (ass >> 11) & 0x3;	/* HP to chassis */
>+		if (tmp == 0)
>+			spec->autocfg.hp_pins[0] = porta;
>+		else if (tmp == 1)
>+			spec->autocfg.hp_pins[0] = porte;
>+		else if (tmp == 2)
>+			spec->autocfg.hp_pins[0] = portd;
>+		else
>+			return;
>+	}
>+
>+	snd_hda_codec_write(codec, spec->autocfg.hp_pins[0], 0,
>+			    AC_VERB_SET_UNSOLICITED_ENABLE,
>+			    AC_USRSP_EN | ALC880_HP_EVENT);
>+	spec->unsol_event = alc_sku_unsol_event;
>+}
>+
>+/*
>+ * Fix-up pin default configurations
>+ */
>+
>+struct alc_pincfg {
>+	hda_nid_t nid;
>+	u32 val;
>+};
>+
>+static void alc_fix_pincfg(struct hda_codec *codec,
>+			   const struct snd_pci_quirk *quirk,
>+			   const struct alc_pincfg **pinfix)
>+{
>+	const struct alc_pincfg *cfg;
>+
>+	quirk = snd_pci_quirk_lookup(codec->bus->pci, quirk);
>+	if (!quirk)
>+		return;
>+
>+	cfg = pinfix[quirk->value];
>+	for (; cfg->nid; cfg++) {
>+		int i;
>+		u32 val = cfg->val;
>+		for (i = 0; i < 4; i++) {
>+			snd_hda_codec_write(codec, cfg->nid, 0,
>+				    AC_VERB_SET_CONFIG_DEFAULT_BYTES_0 + i,
>+				    val & 0xff);
>+			val >>= 8;
>+		}
>+	}
> }
> 
> /*
>@@ -716,7 +1150,6 @@ static struct snd_kcontrol_new alc880_capture_mixer[] = {
> 		.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",
>@@ -738,7 +1171,6 @@ static struct snd_kcontrol_new alc880_capture_alt_mixer[] = {
> 		.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",
>@@ -803,7 +1235,7 @@ static struct hda_channel_mode alc880_fivestack_modes[2] = {
> 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,
>@@ -933,7 +1365,6 @@ static struct snd_kcontrol_new alc880_z71v_mixer[] = {
> };
> 
> 
>-/* FIXME! */
> /*
>  * ALC880 F1734 model
>  *
>@@ -949,17 +1380,24 @@ static hda_nid_t alc880_f1734_dac_nids[1] = {
> 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("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("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),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
> 	{ } /* end */
> };
> 
>+static struct hda_input_mux alc880_f1734_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "Mic", 0x1 },
>+		{ "CD", 0x4 },
>+	},
>+};
>+
> 
>-/* FIXME! */
> /*
>  * ALC880 ASUS model
>  *
>@@ -996,7 +1434,6 @@ static struct snd_kcontrol_new alc880_asus_mixer[] = {
> 	{ } /* end */
> };
> 
>-/* FIXME! */
> /*
>  * ALC880 ASUS W1V model
>  *
>@@ -1034,7 +1471,6 @@ static struct snd_kcontrol_new alc880_tcl_s700_mixer[] = {
> 		.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",
>@@ -1048,10 +1484,10 @@ static struct snd_kcontrol_new alc880_tcl_s700_mixer[] = {
> 
> /* Uniwill */
> static struct snd_kcontrol_new alc880_uniwill_mixer[] = {
>-	HDA_CODEC_VOLUME("HPhone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>-	HDA_BIND_MUTE("HPhone Playback Switch", 0x0c, 2, HDA_INPUT),
>-	HDA_CODEC_VOLUME("iSpeaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
>-	HDA_BIND_MUTE("iSpeaker Playback Switch", 0x0d, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Speaker 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),
>@@ -1091,16 +1527,49 @@ static struct snd_kcontrol_new alc880_fujitsu_mixer[] = {
> };
> 
> static struct snd_kcontrol_new alc880_uniwill_p53_mixer[] = {
>-	HDA_CODEC_VOLUME("HPhone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>-	HDA_BIND_MUTE("HPhone Playback Switch", 0x0c, 2, HDA_INPUT),
>-	HDA_CODEC_VOLUME("iSpeaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
>-	HDA_BIND_MUTE("iSpeaker Playback Switch", 0x0d, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
> 	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
> 	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
> 	{ } /* end */
> };
> 
> /*
>+ * virtual master controls
>+ */
>+
>+/*
>+ * slave controls for virtual master
>+ */
>+static const char *alc_slave_vols[] = {
>+	"Front Playback Volume",
>+	"Surround Playback Volume",
>+	"Center Playback Volume",
>+	"LFE Playback Volume",
>+	"Side Playback Volume",
>+	"Headphone Playback Volume",
>+	"Speaker Playback Volume",
>+	"Mono Playback Volume",
>+	"Line-Out Playback Volume",
>+	NULL,
>+};
>+
>+static const char *alc_slave_sws[] = {
>+	"Front Playback Switch",
>+	"Surround Playback Switch",
>+	"Center Playback Switch",
>+	"LFE Playback Switch",
>+	"Side Playback Switch",
>+	"Headphone Playback Switch",
>+	"Speaker Playback Switch",
>+	"Mono Playback Switch",
>+	"IEC958 Playback Switch",
>+	NULL,
>+};
>+
>+/*
>  * build control elements
>  */
> static int alc_build_controls(struct hda_codec *codec)
>@@ -1120,12 +1589,35 @@ static int alc_build_controls(struct hda_codec *codec)
> 						    spec->multiout.dig_out_nid);
> 		if (err < 0)
> 			return err;
>+		err = snd_hda_create_spdif_share_sw(codec,
>+						    &spec->multiout);
>+		if (err < 0)
>+			return err;
>+		spec->multiout.share_spdif = 1;
> 	}
> 	if (spec->dig_in_nid) {
> 		err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
> 		if (err < 0)
> 			return err;
> 	}
>+
>+	/* if we have no master control, let's create it */
>+	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
>+		unsigned int vmaster_tlv[4];
>+		snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid,
>+					HDA_OUTPUT, vmaster_tlv);
>+		err = snd_hda_add_vmaster(codec, "Master Playback Volume",
>+					  vmaster_tlv, alc_slave_vols);
>+		if (err < 0)
>+			return err;
>+	}
>+	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {
>+		err = snd_hda_add_vmaster(codec, "Master Playback Switch",
>+					  NULL, alc_slave_sws);
>+		if (err < 0)
>+			return err;
>+	}
>+
> 	return 0;
> }
> 
>@@ -1154,11 +1646,13 @@ static struct hda_verb alc880_volume_init_verbs[] = {
> 	 * 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)},
>+	{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)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
> 
> 	/*
> 	 * Set up output mixers (0x0c - 0x0f)
>@@ -1411,25 +1905,36 @@ static struct hda_verb alc880_beep_init_verbs[] = {
> };
> 
> /* toggle speaker-output according to the hp-jack state */
>-static void alc880_uniwill_automute(struct hda_codec *codec)
>+static void alc880_uniwill_hp_automute(struct hda_codec *codec)
> {
>  	unsigned int present;
>+	unsigned char bits;
> 
>  	present = snd_hda_codec_read(codec, 0x14, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>-	snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_amp_update(codec, 0x16, 0, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_amp_update(codec, 0x16, 1, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+	snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+/* auto-toggle front mic */
>+static void alc880_uniwill_mic_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+	unsigned char bits;
> 
> 	present = snd_hda_codec_read(codec, 0x18, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>-	snd_hda_codec_write(codec, 0x0b, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>-			    0x7000 | (0x01 << 8) | (present ? 0x80 : 0));
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc880_uniwill_automute(struct hda_codec *codec)
>+{
>+	alc880_uniwill_hp_automute(codec);
>+	alc880_uniwill_mic_automute(codec);
> }
> 
> static void alc880_uniwill_unsol_event(struct hda_codec *codec,
>@@ -1438,22 +1943,25 @@ static void alc880_uniwill_unsol_event(struct hda_codec *codec,
> 	/* Looks like the unsol event is incompatible with the standard
> 	 * definition.  4bit tag is placed at 28 bit!
> 	 */
>-	if ((res >> 28) == ALC880_HP_EVENT ||
>-	    (res >> 28) == ALC880_MIC_EVENT)
>-		alc880_uniwill_automute(codec);
>+	switch (res >> 28) {
>+	case ALC880_HP_EVENT:
>+		alc880_uniwill_hp_automute(codec);
>+		break;
>+	case ALC880_MIC_EVENT:
>+		alc880_uniwill_mic_automute(codec);
>+		break;
>+	}
> }
> 
> static void alc880_uniwill_p53_hp_automute(struct hda_codec *codec)
> {
>  	unsigned int present;
>+	unsigned char bits;
> 
>  	present = snd_hda_codec_read(codec, 0x14, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>-
>-	snd_hda_codec_amp_update(codec, 0x15, 0, HDA_INPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_amp_update(codec, 0x15, 1, HDA_INPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, HDA_AMP_MUTE, bits);
> }
> 
> static void alc880_uniwill_p53_dcvol_automute(struct hda_codec *codec)
>@@ -1461,19 +1969,14 @@ static void alc880_uniwill_p53_dcvol_automute(struct hda_codec *codec)
> 	unsigned int present;
> 	
> 	present = snd_hda_codec_read(codec, 0x21, 0,
>-				     AC_VERB_GET_VOLUME_KNOB_CONTROL, 0) & 0x7f;
>-
>-	snd_hda_codec_amp_update(codec, 0x0c, 0, HDA_OUTPUT, 0,
>-				 0x7f, present);
>-	snd_hda_codec_amp_update(codec, 0x0c, 1, HDA_OUTPUT, 0,
>-				 0x7f,  present);
>-
>-	snd_hda_codec_amp_update(codec, 0x0d, 0, HDA_OUTPUT, 0,
>-				 0x7f,  present);
>-	snd_hda_codec_amp_update(codec, 0x0d, 1, HDA_OUTPUT, 0,
>-				 0x7f, present);
>-
>+				     AC_VERB_GET_VOLUME_KNOB_CONTROL, 0);
>+	present &= HDA_AMP_VOLMASK;
>+	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_OUTPUT, 0,
>+				 HDA_AMP_VOLMASK, present);
>+	snd_hda_codec_amp_stereo(codec, 0x0d, HDA_OUTPUT, 0,
>+				 HDA_AMP_VOLMASK, present);
> }
>+
> static void alc880_uniwill_p53_unsol_event(struct hda_codec *codec,
> 					   unsigned int res)
> {
>@@ -1482,16 +1985,16 @@ static void alc880_uniwill_p53_unsol_event(struct hda_codec *codec,
> 	 */
> 	if ((res >> 28) == ALC880_HP_EVENT)
> 		alc880_uniwill_p53_hp_automute(codec);
>-	if ((res >> 28) == ALC880_DCVOL_EVENT) 
>+	if ((res >> 28) == ALC880_DCVOL_EVENT)
> 		alc880_uniwill_p53_dcvol_automute(codec);
> }
> 
>-/* FIXME! */
> /*
>  * F1734 pin configuration:
>  * HP = 0x14, speaker-out = 0x15, mic = 0x18
>  */
> static struct hda_verb alc880_pin_f1734_init_verbs[] = {
>+	{0x07, AC_VERB_SET_CONNECT_SEL, 0x01},
> 	{0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
> 	{0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
> 	{0x12, AC_VERB_SET_CONNECT_SEL, 0x01},
>@@ -1504,7 +2007,7 @@ static struct hda_verb alc880_pin_f1734_init_verbs[] = {
> 
> 	{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_PIN_WIDGET_CONTROL, PIN_VREF50},
> 	{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},
>@@ -1512,10 +2015,12 @@ static struct hda_verb alc880_pin_f1734_init_verbs[] = {
> 	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
> 	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
> 
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_HP_EVENT},
>+	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_DCVOL_EVENT},
>+
> 	{ }
> };
> 
>-/* FIXME! */
> /*
>  * ASUS pin configuration:
>  * HP/front = 0x14, surr = 0x15, clfe = 0x16, mic = 0x18, line = 0x1a
>@@ -1549,22 +2054,8 @@ static struct hda_verb alc880_pin_asus_init_verbs[] = {
> };
> 
> /* 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},
>-
>-	{ }
>-};
>-
>-/* 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},
>-
>-	{ }
>-};
>+#define alc880_gpio1_init_verbs	alc_gpio1_init_verbs
>+#define alc880_gpio2_init_verbs	alc_gpio2_init_verbs
> 
> /* Clevo m520g init */
> static struct hda_verb alc880_pin_clevo_init_verbs[] = {
>@@ -1676,9 +2167,8 @@ static struct hda_channel_mode alc880_lg_ch_modes[3] = {
> };
> 
> static struct snd_kcontrol_new alc880_lg_mixer[] = {
>-	/* FIXME: it's not really "master" but front channels */
>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
>-	HDA_BIND_MUTE("Master Playback Switch", 0x0f, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Front Playback Switch", 0x0f, 2, HDA_INPUT),
> 	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
> 	HDA_BIND_MUTE("Surround Playback Switch", 0x0c, 2, HDA_INPUT),
> 	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0d, 1, 0x0, HDA_OUTPUT),
>@@ -1708,8 +2198,8 @@ static struct hda_verb alc880_lg_init_verbs[] = {
> 	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
> 	/* mute all amp mixer inputs */
> 	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},
>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(6)},
>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(7)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
> 	/* line-in to input */
> 	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
> 	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>@@ -1736,13 +2226,13 @@ static struct hda_verb alc880_lg_init_verbs[] = {
> static void alc880_lg_automute(struct hda_codec *codec)
> {
> 	unsigned int present;
>+	unsigned char bits;
> 
> 	present = snd_hda_codec_read(codec, 0x1b, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>-	snd_hda_codec_amp_update(codec, 0x17, 0, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_amp_update(codec, 0x17, 1, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
> }
> 
> static void alc880_lg_unsol_event(struct hda_codec *codec, unsigned int res)
>@@ -1760,41 +2250,62 @@ static void alc880_lg_unsol_event(struct hda_codec *codec, unsigned int res)
>  * Pin assignment:
>  *   Speaker-out: 0x14
>  *   Mic-In: 0x18
>- *   Built-in Mic-In: 0x19 (?)
>- *   HP-Out: 0x1b
>+ *   Built-in Mic-In: 0x19
>+ *   Line-In: 0x1b
>+ *   HP-Out: 0x1a
>  *   SPDIF-Out: 0x1e
>  */
> 
>-/* seems analog CD is not working */
> static struct hda_input_mux alc880_lg_lw_capture_source = {
>-	.num_items = 2,
>+	.num_items = 3,
> 	.items = {
> 		{ "Mic", 0x0 },
> 		{ "Internal Mic", 0x1 },
>+		{ "Line In", 0x2 },
> 	},
> };
> 
>+#define alc880_lg_lw_modes alc880_threestack_modes
>+
> static struct snd_kcontrol_new alc880_lg_lw_mixer[] = {
>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>-	HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT),
>+	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("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("Internal Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
> 	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x01, 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,
>+	},
> 	{ } /* end */
> };
> 
> static struct hda_verb alc880_lg_lw_init_verbs[] = {
>+	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
>+	{0x10, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */
>+	{0x12, AC_VERB_SET_CONNECT_SEL, 0x03}, /* line/surround */
>+
> 	/* set capture source to mic-in */
> 	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
> 	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
> 	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(7)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
> 	/* speaker-out */
> 	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
> 	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
> 	/* HP-out */
>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00},
> 	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
> 	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
> 	/* mic-in to input */
>@@ -1812,13 +2323,13 @@ static struct hda_verb alc880_lg_lw_init_verbs[] = {
> static void alc880_lg_lw_automute(struct hda_codec *codec)
> {
> 	unsigned int present;
>+	unsigned char bits;
> 
> 	present = snd_hda_codec_read(codec, 0x1b, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>-	snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
> }
> 
> static void alc880_lg_lw_unsol_event(struct hda_codec *codec, unsigned int res)
>@@ -1830,6 +2341,93 @@ static void alc880_lg_lw_unsol_event(struct hda_codec *codec, unsigned int res)
> 		alc880_lg_lw_automute(codec);
> }
> 
>+static struct snd_kcontrol_new alc880_medion_rim_mixer[] = {
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, 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("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Internal Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct hda_input_mux alc880_medion_rim_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "Mic", 0x0 },
>+		{ "Internal Mic", 0x1 },
>+	},
>+};
>+
>+static struct hda_verb alc880_medion_rim_init_verbs[] = {
>+	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
>+
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{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_MUTE},
>+	/* Internal Speaker */
>+	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+
>+	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},
>+	{0x20, AC_VERB_SET_PROC_COEF,  0x3060},
>+
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	{ }
>+};
>+
>+/* toggle speaker-output according to the hp-jack state */
>+static void alc880_medion_rim_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+	present = snd_hda_codec_read(codec, 0x14, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0)
>+		& AC_PINSENSE_PRESENCE;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+	if (present)
>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0);
>+	else
>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 2);
>+}
>+
>+static void alc880_medion_rim_unsol_event(struct hda_codec *codec,
>+					  unsigned int res)
>+{
>+	/* Looks like the unsol event is incompatible with the standard
>+	 * definition.  4bit tag is placed at 28 bit!
>+	 */
>+	if ((res >> 28) == ALC880_HP_EVENT)
>+		alc880_medion_rim_automute(codec);
>+}
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list alc880_loopbacks[] = {
>+	{ 0x0b, HDA_INPUT, 0 },
>+	{ 0x0b, HDA_INPUT, 1 },
>+	{ 0x0b, HDA_INPUT, 2 },
>+	{ 0x0b, HDA_INPUT, 3 },
>+	{ 0x0b, HDA_INPUT, 4 },
>+	{ } /* end */
>+};
>+
>+static struct hda_amp_list alc880_lg_loopbacks[] = {
>+	{ 0x0b, HDA_INPUT, 1 },
>+	{ 0x0b, HDA_INPUT, 6 },
>+	{ 0x0b, HDA_INPUT, 7 },
>+	{ } /* end */
>+};
>+#endif
>+
> /*
>  * Common callbacks
>  */
>@@ -1839,6 +2437,8 @@ static int alc_init(struct hda_codec *codec)
> 	struct alc_spec *spec = codec->spec;
> 	unsigned int i;
> 
>+	alc_fix_pll(codec);
>+
> 	for (i = 0; i < spec->num_init_verbs; i++)
> 		snd_hda_sequence_write(codec, spec->init_verbs[i]);
> 
>@@ -1856,24 +2456,11 @@ static void alc_unsol_event(struct hda_codec *codec, unsigned int res)
> 		spec->unsol_event(codec, res);
> }
> 
>-#ifdef CONFIG_PM
>-/*
>- * resume
>- */
>-static int alc_resume(struct hda_codec *codec)
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static int alc_check_power_status(struct hda_codec *codec, hda_nid_t nid)
> {
> 	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;
>+	return snd_hda_check_amp_list_power(codec, &spec->loopback, nid);
> }
> #endif
> 
>@@ -1885,7 +2472,8 @@ static int alc880_playback_pcm_open(struct hda_pcm_stream *hinfo,
> 				    struct snd_pcm_substream *substream)
> {
> 	struct alc_spec *spec = codec->spec;
>-	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
>+	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
>+					     hinfo);
> }
> 
> static int alc880_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
>@@ -1918,6 +2506,17 @@ static int alc880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
> 	return snd_hda_multi_out_dig_open(codec, &spec->multiout);
> }
> 
>+static int alc880_dig_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_dig_prepare(codec, &spec->multiout,
>+					     stream_tag, format, substream);
>+}
>+
> static int alc880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
> 					 struct hda_codec *codec,
> 					 struct snd_pcm_substream *substream)
>@@ -1929,7 +2528,7 @@ static int alc880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
> /*
>  * Analog capture
>  */
>-static int alc880_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
>+static int alc880_alt_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
> 				      struct hda_codec *codec,
> 				      unsigned int stream_tag,
> 				      unsigned int format,
>@@ -1937,19 +2536,19 @@ static int alc880_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
> {
> 	struct alc_spec *spec = codec->spec;
> 
>-	snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
>+	snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number + 1],
> 				   stream_tag, 0, format);
> 	return 0;
> }
> 
>-static int alc880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
>+static int alc880_alt_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);
>+	snd_hda_codec_cleanup_stream(codec,
>+				     spec->adc_nids[substream->number + 1]);
> 	return 0;
> }
> 
>@@ -1969,13 +2568,27 @@ static struct hda_pcm_stream alc880_pcm_analog_playback = {
> };
> 
> static struct hda_pcm_stream alc880_pcm_analog_capture = {
>-	.substreams = 2,
>+	.substreams = 1,
>+	.channels_min = 2,
>+	.channels_max = 2,
>+	/* NID is set in alc_build_pcms */
>+};
>+
>+static struct hda_pcm_stream alc880_pcm_analog_alt_playback = {
>+	.substreams = 1,
>+	.channels_min = 2,
>+	.channels_max = 2,
>+	/* NID is set in alc_build_pcms */
>+};
>+
>+static struct hda_pcm_stream alc880_pcm_analog_alt_capture = {
>+	.substreams = 2, /* can be overridden */
> 	.channels_min = 2,
> 	.channels_max = 2,
> 	/* NID is set in alc_build_pcms */
> 	.ops = {
>-		.prepare = alc880_capture_pcm_prepare,
>-		.cleanup = alc880_capture_pcm_cleanup
>+		.prepare = alc880_alt_capture_pcm_prepare,
>+		.cleanup = alc880_alt_capture_pcm_cleanup
> 	},
> };
> 
>@@ -1986,7 +2599,8 @@ static struct hda_pcm_stream alc880_pcm_digital_playback = {
> 	/* NID is set in alc_build_pcms */
> 	.ops = {
> 		.open = alc880_dig_playback_pcm_open,
>-		.close = alc880_dig_playback_pcm_close
>+		.close = alc880_dig_playback_pcm_close,
>+		.prepare = alc880_dig_playback_pcm_prepare
> 	},
> };
> 
>@@ -1998,7 +2612,7 @@ static struct hda_pcm_stream alc880_pcm_digital_capture = {
> };
> 
> /* Used by alc_build_pcms to flag that a PCM has no playback stream */
>-static struct hda_pcm_stream alc_pcm_null_playback = {
>+static struct hda_pcm_stream alc_pcm_null_stream = {
> 	.substreams = 0,
> 	.channels_min = 0,
> 	.channels_max = 0,
>@@ -2039,6 +2653,7 @@ static int alc_build_pcms(struct hda_codec *codec)
> 		codec->num_pcms = 2;
> 		info = spec->pcm_rec + 1;
> 		info->name = spec->stream_name_digital;
>+		info->pcm_type = HDA_PCM_TYPE_SPDIF;
> 		if (spec->multiout.dig_out_nid &&
> 		    spec->stream_digital_playback) {
> 			info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_digital_playback);
>@@ -2055,17 +2670,32 @@ static int alc_build_pcms(struct hda_codec *codec)
> 	 * model, configure a second analog capture-only PCM.
> 	 */
> 	/* Additional Analaog capture for index #2 */
>-	if (spec->num_adc_nids > 1 && spec->stream_analog_capture &&
>-	    spec->adc_nids) {
>+	if ((spec->alt_dac_nid && spec->stream_analog_alt_playback) ||
>+	    (spec->num_adc_nids > 1 && spec->stream_analog_alt_capture)) {
> 		codec->num_pcms = 3;
> 		info = spec->pcm_rec + 2;
> 		info->name = spec->stream_name_analog;
>-		/* No playback stream for second PCM */
>-		info->stream[SNDRV_PCM_STREAM_PLAYBACK] = alc_pcm_null_playback;
>-		info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = 0;
>-		if (spec->stream_analog_capture) {
>-			info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
>-			info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[1];
>+		if (spec->alt_dac_nid) {
>+			info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
>+				*spec->stream_analog_alt_playback;
>+			info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
>+				spec->alt_dac_nid;
>+		} else {
>+			info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
>+				alc_pcm_null_stream;
>+			info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = 0;
>+		}
>+		if (spec->num_adc_nids > 1) {
>+			info->stream[SNDRV_PCM_STREAM_CAPTURE] =
>+				*spec->stream_analog_alt_capture;
>+			info->stream[SNDRV_PCM_STREAM_CAPTURE].nid =
>+				spec->adc_nids[1];
>+			info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams =
>+				spec->num_adc_nids - 1;
>+		} else {
>+			info->stream[SNDRV_PCM_STREAM_CAPTURE] =
>+				alc_pcm_null_stream;
>+			info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = 0;
> 		}
> 	}
> 
>@@ -2077,7 +2707,7 @@ static void alc_free(struct hda_codec *codec)
> 	struct alc_spec *spec = codec->spec;
> 	unsigned int i;
> 
>-	if (! spec)
>+	if (!spec)
> 		return;
> 
> 	if (spec->kctl_alloc) {
>@@ -2086,6 +2716,7 @@ static void alc_free(struct hda_codec *codec)
> 		kfree(spec->kctl_alloc);
> 	}
> 	kfree(spec);
>+	codec->spec = NULL; /* to be sure */
> }
> 
> /*
>@@ -2096,8 +2727,8 @@ static struct hda_codec_ops alc_patch_ops = {
> 	.init = alc_init,
> 	.free = alc_free,
> 	.unsol_event = alc_unsol_event,
>-#ifdef CONFIG_PM
>-	.resume = alc_resume,
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	.check_power_status = alc_check_power_status,
> #endif
> };
> 
>@@ -2195,11 +2826,14 @@ static int alc_test_pin_ctl_put(struct snd_kcontrol *kcontrol,
> 				     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));
>+		int val;
>+		snd_hda_codec_write_cache(codec, nid, 0,
>+					  AC_VERB_SET_PIN_WIDGET_CONTROL,
>+					  new_ctl);
>+		val = ucontrol->value.enumerated.item[0] >= 3 ?
>+			HDA_AMP_MUTE : 0;
>+		snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, val);
> 		return 1;
> 	}
> 	return 0;
>@@ -2242,7 +2876,8 @@ static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol,
> 	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);
>+		snd_hda_codec_write_cache(codec, nid, 0,
>+					  AC_VERB_SET_CONNECT_SEL, sel);
> 		return 1;
> 	}
> 	return 0;
>@@ -2384,6 +3019,7 @@ static const char *alc880_models[ALC880_MODEL_LAST] = {
> 	[ALC880_F1734]		= "F1734",
> 	[ALC880_LG]		= "lg",
> 	[ALC880_LG_LW]		= "lg-lw",
>+	[ALC880_MEDION_RIM]	= "medion",
> #ifdef CONFIG_SND_DEBUG
> 	[ALC880_TEST]		= "test",
> #endif
>@@ -2391,23 +3027,17 @@ static const char *alc880_models[ALC880_MODEL_LAST] = {
> };
> 
> static struct snd_pci_quirk alc880_cfg_tbl[] = {
>-	/* Broken BIOS configuration */
>-	SND_PCI_QUIRK(0x2668, 0x8086, NULL, ALC880_6ST_DIG),
>-	SND_PCI_QUIRK(0x8086, 0x2668, NULL, ALC880_6ST_DIG),
>-
>+	SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_W810),
> 	SND_PCI_QUIRK(0x1019, 0xa880, "ECS", ALC880_5ST_DIG),
> 	SND_PCI_QUIRK(0x1019, 0xa884, "Acer APFV", ALC880_6ST),
>-	SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_W810),
> 	SND_PCI_QUIRK(0x1025, 0x0070, "ULI", ALC880_3ST_DIG),
> 	SND_PCI_QUIRK(0x1025, 0x0077, "ULI", ALC880_6ST_DIG),
> 	SND_PCI_QUIRK(0x1025, 0x0078, "ULI", ALC880_6ST_DIG),
> 	SND_PCI_QUIRK(0x1025, 0x0087, "ULI", ALC880_6ST_DIG),
> 	SND_PCI_QUIRK(0x1025, 0xe309, "ULI", ALC880_3ST_DIG),
> 	SND_PCI_QUIRK(0x1025, 0xe310, "ULI", ALC880_3ST),
>-
> 	SND_PCI_QUIRK(0x1039, 0x1234, NULL, ALC880_6ST_DIG),
> 	SND_PCI_QUIRK(0x103c, 0x2a09, "HP", ALC880_5ST),
>-
> 	SND_PCI_QUIRK(0x1043, 0x10b3, "ASUS W1V", ALC880_ASUS_W1V),
> 	SND_PCI_QUIRK(0x1043, 0x10c2, "ASUS W6A", ALC880_ASUS_DIG),
> 	SND_PCI_QUIRK(0x1043, 0x10c3, "ASUS Wxx", ALC880_ASUS_DIG),
>@@ -2418,58 +3048,55 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
> 	/* SND_PCI_QUIRK(0x1043, 0x1964, "ASUS", ALC880_ASUS_DIG), */
> 	SND_PCI_QUIRK(0x1043, 0x1973, "ASUS", ALC880_ASUS_DIG),
> 	SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS", ALC880_ASUS_DIG),
>-	SND_PCI_QUIRK(0x1043, 0x814e, "ASUS", ALC880_ASUS),
>+	SND_PCI_QUIRK(0x1043, 0x814e, "ASUS P5GD1 w/SPDIF", ALC880_6ST_DIG),
> 	SND_PCI_QUIRK(0x1043, 0x8181, "ASUS P4GPL", ALC880_ASUS_DIG),
> 	SND_PCI_QUIRK(0x1043, 0x8196, "ASUS P5GD1", ALC880_6ST),
> 	SND_PCI_QUIRK(0x1043, 0x81b4, "ASUS", ALC880_6ST),
>-	SND_PCI_QUIRK(0x1043, 0, "ASUS", ALC880_ASUS),
>-
>-	SND_PCI_QUIRK(0x104d, 0x81d6, "Sony", ALC880_3ST),
>+	SND_PCI_QUIRK(0x1043, 0, "ASUS", ALC880_ASUS), /* default ASUS */
> 	SND_PCI_QUIRK(0x104d, 0x81a0, "Sony", ALC880_3ST),
>+	SND_PCI_QUIRK(0x104d, 0x81d6, "Sony", ALC880_3ST),
>+	SND_PCI_QUIRK(0x107b, 0x3032, "Gateway", ALC880_5ST),
> 	SND_PCI_QUIRK(0x107b, 0x3033, "Gateway", ALC880_5ST),
> 	SND_PCI_QUIRK(0x107b, 0x4039, "Gateway", ALC880_5ST),
>-	SND_PCI_QUIRK(0x107b, 0x3032, "Gateway", ALC880_5ST),
>-	SND_PCI_QUIRK(0x1558, 0x0520, "Clevo m520G", ALC880_CLEVO),
>-	SND_PCI_QUIRK(0x1558, 0x0660, "Clevo m655n", ALC880_CLEVO),
>-	SND_PCI_QUIRK(0x1565, 0x8202, "Biostar", ALC880_5ST_DIG),
>-	SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_W810),
>-	SND_PCI_QUIRK(0x1695, 0x400d, "EPoX", ALC880_5ST_DIG),
>-	SND_PCI_QUIRK(0x19db, 0x4188, "TCL S700", ALC880_TCL_S700),
>-	SND_PCI_QUIRK(0xa0a0, 0x0560, "AOpen i915GMm-HFS", ALC880_5ST_DIG),
>-	SND_PCI_QUIRK(0xe803, 0x1019, NULL, ALC880_6ST_DIG),
> 	SND_PCI_QUIRK(0x1297, 0xc790, "Shuttle ST20G5", ALC880_6ST_DIG),
> 	SND_PCI_QUIRK(0x1458, 0xa102, "Gigabyte K8", ALC880_6ST_DIG),
> 	SND_PCI_QUIRK(0x1462, 0x1150, "MSI", ALC880_6ST_DIG),
> 	SND_PCI_QUIRK(0x1509, 0x925d, "FIC P4M", ALC880_6ST_DIG),
>+	SND_PCI_QUIRK(0x1558, 0x0520, "Clevo m520G", ALC880_CLEVO),
>+	SND_PCI_QUIRK(0x1558, 0x0660, "Clevo m655n", ALC880_CLEVO),
> 	SND_PCI_QUIRK(0x1558, 0x5401, "ASUS", ALC880_ASUS_DIG2),
>-
>+	SND_PCI_QUIRK(0x1565, 0x8202, "Biostar", ALC880_5ST_DIG),
> 	SND_PCI_QUIRK(0x1584, 0x9050, "Uniwill", ALC880_UNIWILL_DIG),
>+	SND_PCI_QUIRK(0x1584, 0x9054, "Uniwlll", ALC880_F1734),
> 	SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_UNIWILL),
> 	SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_UNIWILL_P53),
>-	SND_PCI_QUIRK(0x1584, 0x9054, "Uniwlll", ALC880_F1734),
>-
>+	SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_W810),
>+	SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_MEDION_RIM),
>+	SND_PCI_QUIRK(0x1695, 0x400d, "EPoX", ALC880_5ST_DIG),
> 	SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG),
>-	SND_PCI_QUIRK(0x1734, 0x10ac, "FSC", ALC880_UNIWILL),
> 	SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_F1734),
>+	SND_PCI_QUIRK(0x1734, 0x10ac, "FSC", ALC880_UNIWILL),
> 	SND_PCI_QUIRK(0x1734, 0x10b0, "Fujitsu", ALC880_FUJITSU),
>-
>+	SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW),
> 	SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG),
> 	SND_PCI_QUIRK(0x1854, 0x0068, "LG w1", ALC880_LG),
>-	SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW),
> 	SND_PCI_QUIRK(0x1854, 0x0077, "LG LW25", ALC880_LG_LW),
>-
>-	SND_PCI_QUIRK(0x8086, 0xe308, "Intel mobo", ALC880_3ST_DIG),
>-	SND_PCI_QUIRK(0x8086, 0xe305, "Intel mobo", ALC880_3ST_DIG),
>-	SND_PCI_QUIRK(0x8086, 0xd402, "Intel mobo", ALC880_3ST_DIG),
>+	SND_PCI_QUIRK(0x19db, 0x4188, "TCL S700", ALC880_TCL_S700),
>+	SND_PCI_QUIRK(0x2668, 0x8086, NULL, ALC880_6ST_DIG), /* broken BIOS */
>+	SND_PCI_QUIRK(0x8086, 0x2668, NULL, ALC880_6ST_DIG),
>+	SND_PCI_QUIRK(0x8086, 0xa100, "Intel mobo", ALC880_5ST_DIG),
> 	SND_PCI_QUIRK(0x8086, 0xd400, "Intel mobo", ALC880_5ST_DIG),
> 	SND_PCI_QUIRK(0x8086, 0xd401, "Intel mobo", ALC880_5ST_DIG),
>+	SND_PCI_QUIRK(0x8086, 0xd402, "Intel mobo", ALC880_3ST_DIG),
> 	SND_PCI_QUIRK(0x8086, 0xe224, "Intel mobo", ALC880_5ST_DIG),
>+	SND_PCI_QUIRK(0x8086, 0xe305, "Intel mobo", ALC880_3ST_DIG),
>+	SND_PCI_QUIRK(0x8086, 0xe308, "Intel mobo", ALC880_3ST_DIG),
> 	SND_PCI_QUIRK(0x8086, 0xe400, "Intel mobo", ALC880_5ST_DIG),
> 	SND_PCI_QUIRK(0x8086, 0xe401, "Intel mobo", ALC880_5ST_DIG),
> 	SND_PCI_QUIRK(0x8086, 0xe402, "Intel mobo", ALC880_5ST_DIG),
>-	SND_PCI_QUIRK(0x8086, 0xa100, "Intel mobo", ALC880_5ST_DIG),
>-	SND_PCI_QUIRK(0x8086, 0, "Intel mobo", ALC880_3ST),
>-
>+	SND_PCI_QUIRK(0x8086, 0, "Intel mobo", ALC880_3ST), /* default Intel */
>+	SND_PCI_QUIRK(0xa0a0, 0x0560, "AOpen i915GMm-HFS", ALC880_5ST_DIG),
>+	SND_PCI_QUIRK(0xe803, 0x1019, NULL, ALC880_6ST_DIG),
> 	{}
> };
> 
>@@ -2479,7 +3106,8 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
> 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 },
>+		.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),
>@@ -2489,7 +3117,8 @@ static struct alc_config_preset alc880_presets[] = {
> 	},
> 	[ALC880_3ST_DIG] = {
> 		.mixers = { alc880_three_stack_mixer },
>-		.init_verbs = { alc880_volume_init_verbs, alc880_pin_3stack_init_verbs },
>+		.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,
>@@ -2511,8 +3140,10 @@ static struct alc_config_preset alc880_presets[] = {
> 		.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 },
>+		.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),
>@@ -2520,8 +3151,10 @@ static struct alc_config_preset alc880_presets[] = {
> 		.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 },
>+		.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,
>@@ -2531,7 +3164,8 @@ static struct alc_config_preset alc880_presets[] = {
> 	},
> 	[ALC880_6ST] = {
> 		.mixers = { alc880_six_stack_mixer },
>-		.init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },
>+		.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),
>@@ -2540,7 +3174,8 @@ static struct alc_config_preset alc880_presets[] = {
> 	},
> 	[ALC880_6ST_DIG] = {
> 		.mixers = { alc880_six_stack_mixer },
>-		.init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },
>+		.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,
>@@ -2550,7 +3185,8 @@ static struct alc_config_preset alc880_presets[] = {
> 	},
> 	[ALC880_W810] = {
> 		.mixers = { alc880_w810_base_mixer },
>-		.init_verbs = { alc880_volume_init_verbs, alc880_pin_w810_init_verbs,
>+		.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,
>@@ -2561,7 +3197,8 @@ static struct alc_config_preset alc880_presets[] = {
> 	},
> 	[ALC880_Z71V] = {
> 		.mixers = { alc880_z71v_mixer },
>-		.init_verbs = { alc880_volume_init_verbs, alc880_pin_z71v_init_verbs },
>+		.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,
>@@ -2572,17 +3209,21 @@ static struct alc_config_preset alc880_presets[] = {
> 	},
> 	[ALC880_F1734] = {
> 		.mixers = { alc880_f1734_mixer },
>-		.init_verbs = { alc880_volume_init_verbs, alc880_pin_f1734_init_verbs },
>+		.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,
>+		.input_mux = &alc880_f1734_capture_source,
>+		.unsol_event = alc880_uniwill_p53_unsol_event,
>+		.init_hook = alc880_uniwill_p53_hp_automute,
> 	},
> 	[ALC880_ASUS] = {
> 		.mixers = { alc880_asus_mixer },
>-		.init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
>+		.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,
>@@ -2593,7 +3234,8 @@ static struct alc_config_preset alc880_presets[] = {
> 	},
> 	[ALC880_ASUS_DIG] = {
> 		.mixers = { alc880_asus_mixer },
>-		.init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
>+		.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,
>@@ -2605,7 +3247,8 @@ static struct alc_config_preset alc880_presets[] = {
> 	},
> 	[ALC880_ASUS_DIG2] = {
> 		.mixers = { alc880_asus_mixer },
>-		.init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
>+		.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,
>@@ -2617,7 +3260,8 @@ static struct alc_config_preset alc880_presets[] = {
> 	},
> 	[ALC880_ASUS_W1V] = {
> 		.mixers = { alc880_asus_mixer, alc880_asus_w1v_mixer },
>-		.init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
>+		.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,
>@@ -2666,13 +3310,14 @@ static struct alc_config_preset alc880_presets[] = {
> 		.init_hook = alc880_uniwill_p53_hp_automute,
> 	},
> 	[ALC880_FUJITSU] = {
>-		.mixers = { alc880_fujitsu_mixer, 
>+		.mixers = { alc880_fujitsu_mixer,
> 			    alc880_pcbeep_mixer, },
> 		.init_verbs = { alc880_volume_init_verbs,
> 				alc880_uniwill_p53_init_verbs,
> 	       			alc880_beep_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_2_jack_modes),
> 		.channel_mode = alc880_2_jack_modes,
> 		.input_mux = &alc880_capture_source,
>@@ -2704,20 +3349,37 @@ static struct alc_config_preset alc880_presets[] = {
> 		.input_mux = &alc880_lg_capture_source,
> 		.unsol_event = alc880_lg_unsol_event,
> 		.init_hook = alc880_lg_automute,
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+		.loopbacks = alc880_lg_loopbacks,
>+#endif
> 	},
> 	[ALC880_LG_LW] = {
> 		.mixers = { alc880_lg_lw_mixer },
> 		.init_verbs = { alc880_volume_init_verbs,
> 				alc880_lg_lw_init_verbs },
>-		.num_dacs = 1, 
>+		.num_dacs = ARRAY_SIZE(alc880_dac_nids),
> 		.dac_nids = alc880_dac_nids,
> 		.dig_out_nid = ALC880_DIGOUT_NID,
>-		.num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
>-		.channel_mode = alc880_2_jack_modes,
>+		.num_channel_mode = ARRAY_SIZE(alc880_lg_lw_modes),
>+		.channel_mode = alc880_lg_lw_modes,
> 		.input_mux = &alc880_lg_lw_capture_source,
> 		.unsol_event = alc880_lg_lw_unsol_event,
> 		.init_hook = alc880_lg_lw_automute,
> 	},
>+	[ALC880_MEDION_RIM] = {
>+		.mixers = { alc880_medion_rim_mixer },
>+		.init_verbs = { alc880_volume_init_verbs,
>+				alc880_medion_rim_init_verbs,
>+				alc_gpio2_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_2_jack_modes),
>+		.channel_mode = alc880_2_jack_modes,
>+		.input_mux = &alc880_medion_rim_capture_source,
>+		.unsol_event = alc880_medion_rim_unsol_event,
>+		.init_hook = alc880_medion_rim_automute,
>+	},
> #ifdef CONFIG_SND_DEBUG
> 	[ALC880_TEST] = {
> 		.mixers = { alc880_test_mixer },
>@@ -2751,18 +3413,21 @@ static struct snd_kcontrol_new alc880_control_templates[] = {
> };
> 
> /* add dynamic controls */
>-static int add_control(struct alc_spec *spec, int type, const char *name, unsigned long val)
>+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)
>+		/* array + terminator */
>+		knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL);
>+		if (!knew)
> 			return -ENOMEM;
> 		if (spec->kctl_alloc) {
>-			memcpy(knew, spec->kctl_alloc, sizeof(*knew) * spec->num_kctl_alloc);
>+			memcpy(knew, spec->kctl_alloc,
>+			       sizeof(*knew) * spec->num_kctl_alloc);
> 			kfree(spec->kctl_alloc);
> 		}
> 		spec->kctl_alloc = knew;
>@@ -2772,7 +3437,7 @@ static int add_control(struct alc_spec *spec, int type, const char *name, unsign
> 	knew = &spec->kctl_alloc[spec->num_kctl_used];
> 	*knew = alc880_control_templates[type];
> 	knew->name = kstrdup(name, GFP_KERNEL);
>-	if (! knew->name)
>+	if (!knew->name)
> 		return -ENOMEM;
> 	knew->private_value = val;
> 	spec->num_kctl_used++;
>@@ -2792,7 +3457,8 @@ static int add_control(struct alc_spec *spec, int type, const char *name, unsign
> #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)
>+static int alc880_auto_fill_dac_nids(struct alc_spec *spec,
>+				     const struct auto_pin_cfg *cfg)
> {
> 	hda_nid_t nid;
> 	int assigned[4];
>@@ -2817,8 +3483,9 @@ static int alc880_auto_fill_dac_nids(struct alc_spec *spec, const struct auto_pi
> 			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);
>+			if (!assigned[j]) {
>+				spec->multiout.dac_nids[i] =
>+					alc880_idx_to_dac(j);
> 				assigned[j] = 1;
> 				break;
> 			}
>@@ -2833,36 +3500,54 @@ 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" };
>+	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])
>+		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)
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+					  "Center Playback Volume",
>+					  HDA_COMPOSE_AMP_VAL(nid, 1, 0,
>+							      HDA_OUTPUT));
>+			if (err < 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)
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+					  "LFE Playback Volume",
>+					  HDA_COMPOSE_AMP_VAL(nid, 2, 0,
>+							      HDA_OUTPUT));
>+			if (err < 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)
>+			err = add_control(spec, ALC_CTL_BIND_MUTE,
>+					  "Center Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 1, 2,
>+							      HDA_INPUT));
>+			if (err < 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)
>+			err = add_control(spec, ALC_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]);
>-			if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
>-					       HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
>+					  HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
> 				return err;
> 			sprintf(name, "%s Playback Switch", chname[i]);
>-			if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
>-					       HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0)
>+			err = add_control(spec, ALC_CTL_BIND_MUTE, name,
>+					  HDA_COMPOSE_AMP_VAL(nid, 3, 2,
>+							      HDA_INPUT));
>+			if (err < 0)
> 				return err;
> 		}
> 	}
>@@ -2877,51 +3562,57 @@ static int alc880_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin,
> 	int err;
> 	char name[32];
> 
>-	if (! pin)
>+	if (!pin)
> 		return 0;
> 
> 	if (alc880_is_fixed_pin(pin)) {
> 		nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));
> 		/* specify the DAC as the extra output */
>-		if (! spec->multiout.hp_nid)
>+		if (!spec->multiout.hp_nid)
> 			spec->multiout.hp_nid = nid;
> 		else
> 			spec->multiout.extra_out_nid[0] = 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)
>+		err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
>+				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));
>+		if (err < 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)
>+		err = add_control(spec, ALC_CTL_BIND_MUTE, name,
>+				  HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT));
>+		if (err < 0)
> 			return err;
> 	} else if (alc880_is_multi_pin(pin)) {
> 		/* set manual connection */
> 		/* 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)
>+		err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
>+				  HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
>+		if (err < 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,
>+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)
>+	err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
>+			  HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
>+	if (err < 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)
>+	err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
>+			  HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
>+	if (err < 0)
> 		return err;
> 	return 0;
> }
>@@ -2941,21 +3632,31 @@ static int alc880_auto_create_analog_input_ctls(struct alc_spec *spec,
> 					       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->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 alc_set_pin_output(struct hda_codec *codec, hda_nid_t nid,
>+			       unsigned int pin_type)
>+{
>+	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
>+			    pin_type);
>+	/* unmute pin */
>+	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>+			    AMP_OUT_UNMUTE);
>+}
>+
> 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);
>+	alc_set_pin_output(codec, nid, pin_type);
> 	/* need the manual connection? */
> 	if (alc880_is_multi_pin(nid)) {
> 		struct alc_spec *spec = codec->spec;
>@@ -2966,14 +3667,24 @@ static void alc880_auto_set_output_and_unmute(struct hda_codec *codec,
> 	}
> }
> 
>+static int get_pin_type(int line_out_type)
>+{
>+	if (line_out_type == AUTO_PIN_HP_OUT)
>+		return PIN_HP;
>+	else
>+		return PIN_OUT;
>+}
>+
> static void alc880_auto_init_multi_out(struct hda_codec *codec)
> {
> 	struct alc_spec *spec = codec->spec;
> 	int i;
>-
>+	
>+	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);
> 	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);
>+		int pin_type = get_pin_type(spec->autocfg.line_out_type);
>+		alc880_auto_set_output_and_unmute(codec, nid, pin_type, i);
> 	}
> }
> 
>@@ -2998,37 +3709,52 @@ static void alc880_auto_init_analog_input(struct hda_codec *codec)
> 	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);
>+			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,
>+				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 */
>+/* 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)
>+	err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>+					   alc880_ignore);
>+	if (err < 0)
> 		return err;
>-	if (! spec->autocfg.line_outs)
>+	if (!spec->autocfg.line_outs)
> 		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_pins[0],
>-						"Speaker")) < 0 ||
>-	    (err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pins[0],
>-						"Headphone")) < 0 ||
>-	    (err = alc880_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
>+	err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc880_auto_create_extra_out(spec,
>+					   spec->autocfg.speaker_pins[0],
>+					   "Speaker");
>+	if (err < 0)
>+		return err;
>+	err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pins[0],
>+					   "Headphone");
>+	if (err < 0)
>+		return err;
>+	err = alc880_auto_create_analog_input_ctls(spec, &spec->autocfg);
>+	if (err < 0)
> 		return err;
> 
> 	spec->multiout.max_channels = spec->multiout.num_dacs * 2;
>@@ -3052,9 +3778,12 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
> /* additional initialization for auto-configuration model */
> static void alc880_auto_init(struct hda_codec *codec)
> {
>+	struct alc_spec *spec = codec->spec;
> 	alc880_auto_init_multi_out(codec);
> 	alc880_auto_init_extra_out(codec);
> 	alc880_auto_init_analog_input(codec);
>+	if (spec->unsol_event)
>+		alc_sku_automute(codec);
> }
> 
> /*
>@@ -3088,7 +3817,7 @@ static int patch_alc880(struct hda_codec *codec)
> 		if (err < 0) {
> 			alc_free(codec);
> 			return err;
>-		} else if (! err) {
>+		} else if (!err) {
> 			printk(KERN_INFO
> 			       "hda_codec: Cannot set up configuration "
> 			       "from BIOS.  Using 3-stack mode...\n");
>@@ -3102,19 +3831,22 @@ static int patch_alc880(struct hda_codec *codec)
> 	spec->stream_name_analog = "ALC880 Analog";
> 	spec->stream_analog_playback = &alc880_pcm_analog_playback;
> 	spec->stream_analog_capture = &alc880_pcm_analog_capture;
>+	spec->stream_analog_alt_capture = &alc880_pcm_analog_alt_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) {
>+	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 */
>+		/* get type */
>+		wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
> 		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->mixers[spec->num_mixers] =
>+				alc880_capture_alt_mixer;
> 			spec->num_mixers++;
> 		} else {
> 			spec->adc_nids = alc880_adc_nids;
>@@ -3124,9 +3856,15 @@ static int patch_alc880(struct hda_codec *codec)
> 		}
> 	}
> 
>+	spec->vmaster_nid = 0x0c;
>+
> 	codec->patch_ops = alc_patch_ops;
> 	if (board_config == ALC880_AUTO)
> 		spec->init_hook = alc880_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	if (!spec->loopback.amplist)
>+		spec->loopback.amplist = alc880_loopbacks;
>+#endif
> 
> 	return 0;
> }
>@@ -3256,7 +3994,7 @@ static struct snd_kcontrol_new alc260_base_output_mixer[] = {
> 	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
> 	HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
> 	{ } /* end */
>-};	
>+};
> 
> static struct snd_kcontrol_new alc260_input_mixer[] = {
> 	HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
>@@ -3276,18 +4014,135 @@ static struct snd_kcontrol_new alc260_pc_beep_mixer[] = {
> 	{ } /* end */
> };
> 
>+/* update HP, line and mono out pins according to the master switch */
>+static void alc260_hp_master_update(struct hda_codec *codec,
>+				    hda_nid_t hp, hda_nid_t line,
>+				    hda_nid_t mono)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	unsigned int val = spec->master_sw ? PIN_HP : 0;
>+	/* change HP and line-out pins */
>+	snd_hda_codec_write(codec, 0x0f, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
>+			    val);
>+	snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
>+			    val);
>+	/* mono (speaker) depending on the HP jack sense */
>+	val = (val && !spec->jack_present) ? PIN_OUT : 0;
>+	snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
>+			    val);
>+}
>+
>+static int alc260_hp_master_sw_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;
>+	*ucontrol->value.integer.value = spec->master_sw;
>+	return 0;
>+}
>+
>+static int alc260_hp_master_sw_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;
>+	int val = !!*ucontrol->value.integer.value;
>+	hda_nid_t hp, line, mono;
>+
>+	if (val == spec->master_sw)
>+		return 0;
>+	spec->master_sw = val;
>+	hp = (kcontrol->private_value >> 16) & 0xff;
>+	line = (kcontrol->private_value >> 8) & 0xff;
>+	mono = kcontrol->private_value & 0xff;
>+	alc260_hp_master_update(codec, hp, line, mono);
>+	return 1;
>+}
>+
>+static struct snd_kcontrol_new alc260_hp_output_mixer[] = {
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Master Playback Switch",
>+		.info = snd_ctl_boolean_mono_info,
>+		.get = alc260_hp_master_sw_get,
>+		.put = alc260_hp_master_sw_put,
>+		.private_value = (0x0f << 16) | (0x10 << 8) | 0x11
>+	},
>+	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("Speaker Playback Volume", 0x0a, 1, 0x0,
>+			      HDA_OUTPUT),
>+	HDA_BIND_MUTE_MONO("Speaker Playback Switch", 0x0a, 1, 2, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc260_hp_unsol_verbs[] = {
>+	{0x10, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	{},
>+};
>+
>+static void alc260_hp_automute(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x10, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0);
>+	spec->jack_present = (present & AC_PINSENSE_PRESENCE) != 0;
>+	alc260_hp_master_update(codec, 0x0f, 0x10, 0x11);
>+}
>+
>+static void alc260_hp_unsol_event(struct hda_codec *codec, unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc260_hp_automute(codec);
>+}
>+
> static struct snd_kcontrol_new alc260_hp_3013_mixer[] = {
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Master Playback Switch",
>+		.info = snd_ctl_boolean_mono_info,
>+		.get = alc260_hp_master_sw_get,
>+		.put = alc260_hp_master_sw_put,
>+		.private_value = (0x10 << 16) | (0x15 << 8) | 0x11
>+	},
> 	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),
>+	HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x11, 1, 0x0, HDA_OUTPUT),
> 	{ } /* end */
> };
> 
>+static struct hda_verb alc260_hp_3013_unsol_verbs[] = {
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	{},
>+};
>+
>+static void alc260_hp_3013_automute(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x15, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0);
>+	spec->jack_present = (present & AC_PINSENSE_PRESENCE) != 0;
>+	alc260_hp_master_update(codec, 0x10, 0x15, 0x11);
>+}
>+
>+static void alc260_hp_3013_unsol_event(struct hda_codec *codec,
>+				       unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc260_hp_3013_automute(codec);
>+}
>+
> /* Fujitsu S702x series laptops.  ALC260 pin usage: Mic/Line jack = 0x12, 
>  * HP jack = 0x14, CD audio =  0x16, internal speaker = 0x10.
>  */
>@@ -3302,8 +4157,8 @@ static struct snd_kcontrol_new alc260_fujitsu_mixer[] = {
> 	ALC_PIN_MODE("Mic/Line Jack Mode", 0x12, ALC_PIN_DIR_IN),
> 	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),
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x09, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Speaker Playback Switch", 0x09, 2, HDA_INPUT),
> 	{ } /* end */
> };
> 
>@@ -3334,9 +4189,9 @@ static struct snd_kcontrol_new alc260_acer_mixer[] = {
> 	HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),
> 	HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT),
> 	ALC_PIN_MODE("Headphone Jack Mode", 0x0f, ALC_PIN_DIR_INOUT),
>-	HDA_CODEC_VOLUME_MONO("Mono Speaker Playback Volume", 0x0a, 1, 0x0,
>+	HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0a, 1, 0x0,
> 			      HDA_OUTPUT),
>-	HDA_BIND_MUTE_MONO("Mono Speaker Playback Switch", 0x0a, 1, 2,
>+	HDA_BIND_MUTE_MONO("Speaker Playback Switch", 0x0a, 1, 2,
> 			   HDA_INPUT),
> 	HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
> 	HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
>@@ -3351,6 +4206,42 @@ static struct snd_kcontrol_new alc260_acer_mixer[] = {
> 	{ } /* end */
> };
> 
>+/* Packard bell V7900  ALC260 pin usage: HP = 0x0f, Mic jack = 0x12,
>+ * Line In jack = 0x14, CD audio =  0x16, pc beep = 0x17.
>+ */
>+static struct snd_kcontrol_new alc260_will_mixer[] = {
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Master Playback Switch", 0x08, 0x2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
>+	ALC_PIN_MODE("Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),
>+	HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
>+	ALC_PIN_MODE("Line Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
>+	HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
>+	HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
>+	HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+/* Replacer 672V ALC260 pin usage: Mic jack = 0x12,
>+ * Line In jack = 0x14, ATAPI Mic = 0x13, speaker = 0x0f.
>+ */
>+static struct snd_kcontrol_new alc260_replacer_672v_mixer[] = {
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Master Playback Switch", 0x08, 0x2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
>+	ALC_PIN_MODE("Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),
>+	HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x07, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("ATATI Mic Playback Switch", 0x07, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
>+	ALC_PIN_MODE("Line Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
>+	{ } /* end */
>+};
>+
> /* capture mixer elements */
> static struct snd_kcontrol_new alc260_capture_mixer[] = {
> 	HDA_CODEC_VOLUME("Capture Volume", 0x04, 0x0, HDA_INPUT),
>@@ -3361,7 +4252,6 @@ static struct snd_kcontrol_new alc260_capture_mixer[] = {
> 		.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",
>@@ -3380,7 +4270,6 @@ static struct snd_kcontrol_new alc260_capture_alt_mixer[] = {
> 		.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",
>@@ -3436,13 +4325,15 @@ static struct hda_verb alc260_init_verbs[] = {
> 	{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: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 &
>+	 * Line In 2 = 0x03
>+	 */
>+	/* mute analog inputs */
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
> 	/* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
> 	/* mute Front out path */
> 	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>@@ -3484,13 +4375,15 @@ static struct hda_verb alc260_hp_init_verbs[] = {
> 	{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: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 &
>+	 * Line In 2 = 0x03
>+	 */
>+	/* mute analog inputs */
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
> 	/* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
> 	/* Unmute Front out path */
> 	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
>@@ -3532,13 +4425,15 @@ static struct hda_verb alc260_hp_3013_init_verbs[] = {
> 	{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: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 &
>+	 * Line In 2 = 0x03
>+	 */
>+	/* mute analog inputs */
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
> 	/* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
> 	/* Unmute Front out path */
> 	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
>@@ -3682,7 +4577,9 @@ static struct hda_verb alc260_acer_init_verbs[] = {
> 	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
> 	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
> 
>-	/* Unmute Line-out pin widget amp left and right (no equiv mixer ctrl) */
>+	/* Unmute Line-out pin widget amp left and right
>+	 * (no equiv mixer ctrl)
>+	 */
> 	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
> 	/* Unmute mono pin widget amp output (no equiv mixer ctrl) */
> 	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>@@ -3721,6 +4618,59 @@ static struct hda_verb alc260_acer_init_verbs[] = {
> 	{ }
> };
> 
>+static struct hda_verb alc260_will_verbs[] = {
>+	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x0f, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
>+	{0x1a, AC_VERB_SET_COEF_INDEX, 0x07},
>+	{0x1a, AC_VERB_SET_PROC_COEF, 0x3040},
>+	{}
>+};
>+
>+static struct hda_verb alc260_replacer_672v_verbs[] = {
>+	{0x0f, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
>+	{0x1a, AC_VERB_SET_COEF_INDEX, 0x07},
>+	{0x1a, AC_VERB_SET_PROC_COEF, 0x3050},
>+
>+	{0x01, AC_VERB_SET_GPIO_MASK, 0x01},
>+	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
>+	{0x01, AC_VERB_SET_GPIO_DATA, 0x00},
>+
>+	{0x0f, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	{}
>+};
>+
>+/* toggle speaker-output according to the hp-jack state */
>+static void alc260_replacer_672v_automute(struct hda_codec *codec)
>+{
>+        unsigned int present;
>+
>+	/* speaker --> GPIO Data 0, hp or spdif --> GPIO data 1 */
>+        present = snd_hda_codec_read(codec, 0x0f, 0,
>+                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	if (present) {
>+		snd_hda_codec_write_cache(codec, 0x01, 0,
>+					  AC_VERB_SET_GPIO_DATA, 1);
>+		snd_hda_codec_write_cache(codec, 0x0f, 0,
>+					  AC_VERB_SET_PIN_WIDGET_CONTROL,
>+					  PIN_HP);
>+	} else {
>+		snd_hda_codec_write_cache(codec, 0x01, 0,
>+					  AC_VERB_SET_GPIO_DATA, 0);
>+		snd_hda_codec_write_cache(codec, 0x0f, 0,
>+					  AC_VERB_SET_PIN_WIDGET_CONTROL,
>+					  PIN_OUT);
>+	}
>+}
>+
>+static void alc260_replacer_672v_unsol_event(struct hda_codec *codec,
>+                                       unsigned int res)
>+{
>+        if ((res >> 26) == ALC880_HP_EVENT)
>+                alc260_replacer_672v_automute(codec);
>+}
>+
> /* Test configuration for debugging, modelled after the ALC880 test
>  * configuration.
>  */
>@@ -3820,6 +4770,12 @@ static struct snd_kcontrol_new alc260_test_mixer[] = {
> 	ALC_SPDIF_CTRL_SWITCH("SPDIF Playback Switch", 0x03, 0x01),
> 	ALC_SPDIF_CTRL_SWITCH("SPDIF Capture Switch", 0x06, 0x01),
> 
>+	/* A switch allowing EAPD to be enabled.  Some laptops seem to use
>+	 * this output to turn on an external amplifier.
>+	 */
>+	ALC_EAPD_CTRL_SWITCH("LINE-OUT EAPD Enable Switch", 0x0f, 0x02),
>+	ALC_EAPD_CTRL_SWITCH("HP-OUT EAPD Enable Switch", 0x10, 0x02),
>+
> 	{ } /* end */
> };
> static struct hda_verb alc260_test_init_verbs[] = {
>@@ -3905,17 +4861,8 @@ static struct hda_verb alc260_test_init_verbs[] = {
> };
> #endif
> 
>-static struct hda_pcm_stream alc260_pcm_analog_playback = {
>-	.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,
>-};
>+#define alc260_pcm_analog_playback	alc880_pcm_analog_alt_playback
>+#define alc260_pcm_analog_capture	alc880_pcm_analog_capture
> 
> #define alc260_pcm_digital_playback	alc880_pcm_digital_playback
> #define alc260_pcm_digital_capture	alc880_pcm_digital_capture
>@@ -3948,10 +4895,12 @@ static int alc260_add_playback_controls(struct alc_spec *spec, hda_nid_t nid,
> 		return 0; /* N/A */
> 	
> 	snprintf(name, sizeof(name), "%s Playback Volume", pfx);
>-	if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val)) < 0)
>+	err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val);
>+	if (err < 0)
> 		return err;
> 	snprintf(name, sizeof(name), "%s Playback Switch", pfx);
>-	if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, sw_val)) < 0)
>+	err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, sw_val);
>+	if (err < 0)
> 		return err;
> 	return 1;
> }
>@@ -3987,7 +4936,7 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec,
> 		if (err < 0)
> 			return err;
> 	}
>-	return 0;	
>+	return 0;
> }
> 
> /* create playback/capture controls for input pins */
>@@ -4001,20 +4950,24 @@ static int alc260_auto_create_analog_input_ctls(struct alc_spec *spec,
> 		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);
>+					       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].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)){
>+		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);
>+					       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].label =
>+				auto_pin_cfg_labels[i];
> 			imux->items[imux->num_items].index = idx;
> 			imux->num_items++;
> 		}
>@@ -4026,15 +4979,12 @@ 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);
>+	alc_set_pin_output(codec, nid, pin_type);
> 	/* 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);
>-				    
> 	}
> }
> 
>@@ -4043,9 +4993,12 @@ 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);
>+	alc_subsystem_id(codec, 0x10, 0x15, 0x0f);
>+	nid = spec->autocfg.line_out_pins[0];
>+	if (nid) {
>+		int pin_type = get_pin_type(spec->autocfg.line_out_type);
>+		alc260_auto_set_output_and_unmute(codec, nid, pin_type, 0);
>+	}
> 	
> 	nid = spec->autocfg.speaker_pins[0];
> 	if (nid)
>@@ -4053,8 +5006,8 @@ static void alc260_auto_init_multi_out(struct hda_codec *codec)
> 
> 	nid = spec->autocfg.hp_pins[0];
> 	if (nid)
>-		alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
>-}	
>+		alc260_auto_set_output_and_unmute(codec, nid, PIN_HP, 0);
>+}
> 
> #define ALC260_PIN_CD_NID		0x16
> static void alc260_auto_init_analog_input(struct hda_codec *codec)
>@@ -4065,10 +5018,13 @@ static void alc260_auto_init_analog_input(struct hda_codec *codec)
> 	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);
>+			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,
>+				snd_hda_codec_write(codec, nid, 0,
>+						    AC_VERB_SET_AMP_GAIN_MUTE,
> 						    AMP_OUT_MUTE);
> 		}
> 	}
>@@ -4088,15 +5044,16 @@ static struct hda_verb alc260_volume_init_verbs[] = {
> 	
> 	/* 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)
>+	 * 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)},
>+	/* mute analog inputs */
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
> 
> 	/*
> 	 * Set up output mixers (0x08 - 0x0a)
>@@ -4124,14 +5081,17 @@ static int alc260_parse_auto_config(struct hda_codec *codec)
> 	int err;
> 	static hda_nid_t alc260_ignore[] = { 0x17, 0 };
> 
>-	if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>-						alc260_ignore)) < 0)
>+	err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>+					   alc260_ignore);
>+	if (err < 0)
> 		return err;
>-	if ((err = alc260_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0)
>+	err = alc260_auto_create_multi_out_ctls(spec, &spec->autocfg);
>+	if (err < 0)
> 		return err;
>-	if (! spec->kctl_alloc)
>+	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)
>+	err = alc260_auto_create_analog_input_ctls(spec, &spec->autocfg);
>+	if (err < 0)
> 		return err;
> 
> 	spec->multiout.max_channels = 2;
>@@ -4149,7 +5109,7 @@ static int alc260_parse_auto_config(struct hda_codec *codec)
> 	/* 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) {
>+	if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) {
> 		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;
>@@ -4166,10 +5126,24 @@ static int alc260_parse_auto_config(struct hda_codec *codec)
> /* additional initialization for auto-configuration model */
> static void alc260_auto_init(struct hda_codec *codec)
> {
>+	struct alc_spec *spec = codec->spec;
> 	alc260_auto_init_multi_out(codec);
> 	alc260_auto_init_analog_input(codec);
>+	if (spec->unsol_event)
>+		alc_sku_automute(codec);
> }
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list alc260_loopbacks[] = {
>+	{ 0x07, HDA_INPUT, 0 },
>+	{ 0x07, HDA_INPUT, 1 },
>+	{ 0x07, HDA_INPUT, 2 },
>+	{ 0x07, HDA_INPUT, 3 },
>+	{ 0x07, HDA_INPUT, 4 },
>+	{ } /* end */
>+};
>+#endif
>+
> /*
>  * ALC260 configurations
>  */
>@@ -4179,6 +5153,8 @@ static const char *alc260_models[ALC260_MODEL_LAST] = {
> 	[ALC260_HP_3013]	= "hp-3013",
> 	[ALC260_FUJITSU_S702X]	= "fujitsu",
> 	[ALC260_ACER]		= "acer",
>+	[ALC260_WILL]		= "will",
>+	[ALC260_REPLACER_672V]	= "replacer",
> #ifdef CONFIG_SND_DEBUG
> 	[ALC260_TEST]		= "test",
> #endif
>@@ -4202,6 +5178,8 @@ static struct snd_pci_quirk alc260_cfg_tbl[] = {
> 	SND_PCI_QUIRK(0x104d, 0x81cd, "Sony VAIO", ALC260_BASIC),
> 	SND_PCI_QUIRK(0x10cf, 0x1326, "Fujitsu S702X", ALC260_FUJITSU_S702X),
> 	SND_PCI_QUIRK(0x152d, 0x0729, "CTL U553W", ALC260_BASIC),
>+	SND_PCI_QUIRK(0x161f, 0x2057, "Replacer 672V", ALC260_REPLACER_672V),
>+	SND_PCI_QUIRK(0x1631, 0xc017, "PB V7900", ALC260_WILL),
> 	{}
> };
> 
>@@ -4221,10 +5199,11 @@ static struct alc_config_preset alc260_presets[] = {
> 		.input_mux = &alc260_capture_source,
> 	},
> 	[ALC260_HP] = {
>-		.mixers = { alc260_base_output_mixer,
>+		.mixers = { alc260_hp_output_mixer,
> 			    alc260_input_mixer,
> 			    alc260_capture_alt_mixer },
>-		.init_verbs = { alc260_init_verbs },
>+		.init_verbs = { alc260_init_verbs,
>+				alc260_hp_unsol_verbs },
> 		.num_dacs = ARRAY_SIZE(alc260_dac_nids),
> 		.dac_nids = alc260_dac_nids,
> 		.num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),
>@@ -4232,12 +5211,15 @@ static struct alc_config_preset alc260_presets[] = {
> 		.num_channel_mode = ARRAY_SIZE(alc260_modes),
> 		.channel_mode = alc260_modes,
> 		.input_mux = &alc260_capture_source,
>+		.unsol_event = alc260_hp_unsol_event,
>+		.init_hook = alc260_hp_automute,
> 	},
> 	[ALC260_HP_3013] = {
> 		.mixers = { alc260_hp_3013_mixer,
> 			    alc260_input_mixer,
> 			    alc260_capture_alt_mixer },
>-		.init_verbs = { alc260_hp_3013_init_verbs },
>+		.init_verbs = { alc260_hp_3013_init_verbs,
>+				alc260_hp_3013_unsol_verbs },
> 		.num_dacs = ARRAY_SIZE(alc260_dac_nids),
> 		.dac_nids = alc260_dac_nids,
> 		.num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),
>@@ -4245,6 +5227,8 @@ static struct alc_config_preset alc260_presets[] = {
> 		.num_channel_mode = ARRAY_SIZE(alc260_modes),
> 		.channel_mode = alc260_modes,
> 		.input_mux = &alc260_capture_source,
>+		.unsol_event = alc260_hp_3013_unsol_event,
>+		.init_hook = alc260_hp_3013_automute,
> 	},
> 	[ALC260_FUJITSU_S702X] = {
> 		.mixers = { alc260_fujitsu_mixer,
>@@ -4272,6 +5256,34 @@ static struct alc_config_preset alc260_presets[] = {
> 		.num_mux_defs = ARRAY_SIZE(alc260_acer_capture_sources),
> 		.input_mux = alc260_acer_capture_sources,
> 	},
>+	[ALC260_WILL] = {
>+		.mixers = { alc260_will_mixer,
>+			    alc260_capture_mixer },
>+		.init_verbs = { alc260_init_verbs, alc260_will_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,
>+		.dig_out_nid = ALC260_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc260_modes),
>+		.channel_mode = alc260_modes,
>+		.input_mux = &alc260_capture_source,
>+	},
>+	[ALC260_REPLACER_672V] = {
>+		.mixers = { alc260_replacer_672v_mixer,
>+			    alc260_capture_mixer },
>+		.init_verbs = { alc260_init_verbs, alc260_replacer_672v_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,
>+		.dig_out_nid = ALC260_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc260_modes),
>+		.channel_mode = alc260_modes,
>+		.input_mux = &alc260_capture_source,
>+		.unsol_event = alc260_replacer_672v_unsol_event,
>+		.init_hook = alc260_replacer_672v_automute,
>+	},
> #ifdef CONFIG_SND_DEBUG
> 	[ALC260_TEST] = {
> 		.mixers = { alc260_test_mixer,
>@@ -4315,7 +5327,7 @@ static int patch_alc260(struct hda_codec *codec)
> 		if (err < 0) {
> 			alc_free(codec);
> 			return err;
>-		} else if (! err) {
>+		} else if (!err) {
> 			printk(KERN_INFO
> 			       "hda_codec: Cannot set up configuration "
> 			       "from BIOS.  Using base mode...\n");
>@@ -4334,9 +5346,15 @@ static int patch_alc260(struct hda_codec *codec)
> 	spec->stream_digital_playback = &alc260_pcm_digital_playback;
> 	spec->stream_digital_capture = &alc260_pcm_digital_capture;
> 
>+	spec->vmaster_nid = 0x08;
>+
> 	codec->patch_ops = alc_patch_ops;
> 	if (board_config == ALC260_AUTO)
> 		spec->init_hook = alc260_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	if (!spec->loopback.amplist)
>+		spec->loopback.amplist = alc260_loopbacks;
>+#endif
> 
> 	return 0;
> }
>@@ -4369,6 +5387,9 @@ static hda_nid_t alc882_dac_nids[4] = {
> #define alc882_adc_nids		alc880_adc_nids
> #define alc882_adc_nids_alt	alc880_adc_nids_alt
> 
>+static hda_nid_t alc882_capsrc_nids[3] = { 0x24, 0x23, 0x22 };
>+static hda_nid_t alc882_capsrc_nids_alt[2] = { 0x23, 0x22 };
>+
> /* input MUX */
> /* FIXME: should be a matrix-type input source selection */
> 
>@@ -4384,32 +5405,63 @@ static struct hda_input_mux alc882_capture_source = {
> #define alc882_mux_enum_info alc_mux_enum_info
> #define alc882_mux_enum_get alc_mux_enum_get
> 
>-static int alc882_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
>+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];
>+	hda_nid_t nid = spec->capsrc_nids ?
>+		spec->capsrc_nids[adc_idx] : spec->adc_nids[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)
>+	if (*cur_val == idx)
> 		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));
>+		unsigned int v = (i == idx) ? 0 : HDA_AMP_MUTE;
>+		snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT,
>+					 imux->items[i].index,
>+					 HDA_AMP_MUTE, v);
> 	}
> 	*cur_val = idx;
> 	return 1;
> }
> 
> /*
>+ * 2ch mode
>+ */
>+static struct hda_verb alc882_3ST_ch2_init[] = {
>+	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
>+	{ 0x18, 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 },
>+	{ } /* end */
>+};
>+
>+/*
>+ * 6ch mode
>+ */
>+static struct hda_verb alc882_3ST_ch6_init[] = {
>+	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
>+	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },
>+	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
>+	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },
>+	{ } /* end */
>+};
>+
>+static struct hda_channel_mode alc882_3ST_6ch_modes[2] = {
>+	{ 2, alc882_3ST_ch2_init },
>+	{ 6, alc882_3ST_ch6_init },
>+};
>+
>+/*
>  * 6ch mode
>  */
> static struct hda_verb alc882_sixstack_ch6_init[] = {
>@@ -4436,6 +5488,38 @@ static struct hda_channel_mode alc882_sixstack_modes[2] = {
> 	{ 8, alc882_sixstack_ch8_init },
> };
> 
>+/*
>+ * macbook pro ALC885 can switch LineIn to LineOut without loosing Mic
>+ */
>+
>+/*
>+ * 2ch mode
>+ */
>+static struct hda_verb alc885_mbp_ch2_init[] = {
>+	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
>+	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	{ } /* end */
>+};
>+
>+/*
>+ * 6ch mode
>+ */
>+static struct hda_verb alc885_mbp_ch6_init[] = {
>+	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },
>+	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{ } /* end */
>+};
>+
>+static struct hda_channel_mode alc885_mbp_6ch_modes[2] = {
>+	{ 2, alc885_mbp_ch2_init },
>+	{ 6, alc885_mbp_ch6_init },
>+};
>+
>+
> /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17
>  *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b
>  */
>@@ -4466,6 +5550,87 @@ static struct snd_kcontrol_new alc882_base_mixer[] = {
> 	{ } /* end */
> };
> 
>+static struct snd_kcontrol_new alc885_mbp3_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
>+	HDA_BIND_MUTE   ("Front Playback Switch", 0x0c, 0x02, HDA_INPUT),
>+	HDA_CODEC_MUTE  ("Speaker Playback Switch", 0x14, 0x00, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Line-Out Playback Volume", 0x0d, 0x00, HDA_OUTPUT),
>+	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, 0x00, HDA_INPUT),
>+	HDA_CODEC_MUTE  ("Mic Playback Switch", 0x0b, 0x00, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Line Boost", 0x1a, 0x00, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT),
>+	{ } /* end */
>+};
>+static struct snd_kcontrol_new alc882_w2jc_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 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_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
>+	HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc882_targa_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 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("Mic Boost", 0x18, 0, 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("Front Mic Boost", 0x19, 0, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+/* Pin assignment: Front=0x14, HP = 0x15, Front = 0x16, ???
>+ *                 Front Mic=0x18, Line In = 0x1a, Line In = 0x1b, CD = 0x1c
>+ */
>+static struct snd_kcontrol_new alc882_asus_a7j_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Mobile Front Playback Switch", 0x16, 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("Mobile Line Playback Volume", 0x0b, 0x03, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mobile Line Playback Switch", 0x0b, 0x03, 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("Mic Boost", 0x18, 0, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc882_asus_a7m_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
>+	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("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_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
>+	HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
>+	{ } /* end */
>+};
>+
> static struct snd_kcontrol_new alc882_chmode_mixer[] = {
> 	{
> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>@@ -4561,7 +5726,7 @@ static struct hda_verb alc882_eapd_verbs[] = {
> 	/* change to EAPD mode */
> 	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},
> 	{0x20, AC_VERB_SET_PROC_COEF, 0x3060},
>-	{ } 
>+	{ }
> };
> 
> /* Mac Pro test */
>@@ -4626,6 +5791,215 @@ static struct hda_verb alc882_macpro_init_verbs[] = {
> 
> 	{ }
> };
>+
>+/* Macbook Pro rev3 */
>+static struct hda_verb alc885_mbp3_init_verbs[] = {
>+	/* 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)},
>+	/* 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},
>+	/* HP Pin: output 0 (0x0d) */
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc4},
>+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	/* 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: use output 1 when in LineOut mode */
>+	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
>+	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x1a, 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, 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},
>+
>+	{ }
>+};
>+
>+/* iMac 24 mixer. */
>+static struct snd_kcontrol_new alc885_imac24_mixer[] = {
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Master Playback Switch", 0x0c, 0x00, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+/* iMac 24 init verbs. */
>+static struct hda_verb alc885_imac24_init_verbs[] = {
>+	/* Internal speakers: output 0 (0x0c) */
>+	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{0x18, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	/* Internal speakers: output 0 (0x0c) */
>+	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	/* Headphone: output 0 (0x0c) */
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	/* Front Mic: input vref at 80% */
>+	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{ }
>+};
>+
>+/* Toggle speaker-output according to the hp-jack state */
>+static void alc885_imac24_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+
>+ 	present = snd_hda_codec_read(codec, 0x14, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x18, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_amp_stereo(codec, 0x1a, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+}
>+
>+/* Processes unsolicited events. */
>+static void alc885_imac24_unsol_event(struct hda_codec *codec,
>+				      unsigned int res)
>+{
>+	/* Headphone insertion or removal. */
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc885_imac24_automute(codec);
>+}
>+
>+static void alc885_mbp3_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+
>+ 	present = snd_hda_codec_read(codec, 0x15, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x14,  HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? 0 : HDA_AMP_MUTE);
>+
>+}
>+static void alc885_mbp3_unsol_event(struct hda_codec *codec,
>+				    unsigned int res)
>+{
>+	/* Headphone insertion or removal. */
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc885_mbp3_automute(codec);
>+}
>+
>+
>+static struct hda_verb alc882_targa_verbs[] = {
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	
>+	{0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */
>+	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/surround */
>+	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
>+
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	{0x01, AC_VERB_SET_GPIO_MASK, 0x03},
>+	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03},
>+	{0x01, AC_VERB_SET_GPIO_DATA, 0x03},
>+	{ } /* end */
>+};
>+
>+/* toggle speaker-output according to the hp-jack state */
>+static void alc882_targa_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+ 
>+ 	present = snd_hda_codec_read(codec, 0x14, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_write_cache(codec, 1, 0, AC_VERB_SET_GPIO_DATA,
>+				  present ? 1 : 3);
>+}
>+
>+static void alc882_targa_unsol_event(struct hda_codec *codec, unsigned int res)
>+{
>+	/* Looks like the unsol event is incompatible with the standard
>+	 * definition.  4bit tag is placed at 26 bit!
>+	 */
>+	if (((res >> 26) == ALC880_HP_EVENT)) {
>+		alc882_targa_automute(codec);
>+	}
>+}
>+
>+static struct hda_verb alc882_asus_a7j_verbs[] = {
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	
>+	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
>+	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */
>+
>+	{0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */
>+	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/surround */
>+	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc882_asus_a7m_verbs[] = {
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+        
>+	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
>+	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */
>+
>+	{0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */
>+	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/surround */
>+	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
>+ 	{ } /* end */
>+};
>+
> static void alc882_gpio_mute(struct hda_codec *codec, int pin, int muted)
> {
> 	unsigned int gpiostate, gpiomask, gpiodir;
>@@ -4658,6 +6032,20 @@ static void alc882_gpio_mute(struct hda_codec *codec, int pin, int muted)
> 			    AC_VERB_SET_GPIO_DATA, gpiostate);
> }
> 
>+/* set up GPIO at initialization */
>+static void alc885_macpro_init_hook(struct hda_codec *codec)
>+{
>+	alc882_gpio_mute(codec, 0, 0);
>+	alc882_gpio_mute(codec, 1, 0);
>+}
>+
>+/* set up GPIO and update auto-muting at initialization */
>+static void alc885_imac24_init_hook(struct hda_codec *codec)
>+{
>+	alc885_macpro_init_hook(codec);
>+	alc885_imac24_automute(codec);
>+}
>+
> /*
>  * generic initialization of ADC, input mixers and output mixers
>  */
>@@ -4672,17 +6060,17 @@ static struct hda_verb alc882_auto_init_verbs[] = {
> 	{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
>+	/* Mute 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)
>+	 * 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)},
>+	{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)},
> 
> 	/*
> 	 * Set up output mixers (0x0c - 0x0f)
>@@ -4736,7 +6124,6 @@ static struct snd_kcontrol_new alc882_capture_alt_mixer[] = {
> 		.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",
>@@ -4759,7 +6146,6 @@ static struct snd_kcontrol_new alc882_capture_mixer[] = {
> 		.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",
>@@ -4771,6 +6157,10 @@ static struct snd_kcontrol_new alc882_capture_mixer[] = {
> 	{ } /* end */
> };
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+#define alc882_loopbacks	alc880_loopbacks
>+#endif
>+
> /* pcm configuration: identiacal with ALC880 */
> #define alc882_pcm_analog_playback	alc880_pcm_analog_playback
> #define alc882_pcm_analog_capture	alc880_pcm_analog_capture
>@@ -4784,16 +6174,29 @@ static const char *alc882_models[ALC882_MODEL_LAST] = {
> 	[ALC882_3ST_DIG]	= "3stack-dig",
> 	[ALC882_6ST_DIG]	= "6stack-dig",
> 	[ALC882_ARIMA]		= "arima",
>+	[ALC882_W2JC]		= "w2jc",
>+	[ALC882_TARGA]		= "targa",
>+	[ALC882_ASUS_A7J]	= "asus-a7j",
>+	[ALC882_ASUS_A7M]	= "asus-a7m",
> 	[ALC885_MACPRO]		= "macpro",
>+	[ALC885_MBP3]		= "mbp3",
>+	[ALC885_IMAC24]		= "imac24",
> 	[ALC882_AUTO]		= "auto",
> };
> 
> static struct snd_pci_quirk alc882_cfg_tbl[] = {
> 	SND_PCI_QUIRK(0x1019, 0x6668, "ECS", ALC882_6ST_DIG),
>+	SND_PCI_QUIRK(0x1043, 0x060d, "Asus A7J", ALC882_ASUS_A7J),
>+	SND_PCI_QUIRK(0x1043, 0x1243, "Asus A7J", ALC882_ASUS_A7J),
>+	SND_PCI_QUIRK(0x1043, 0x13c2, "Asus A7M", ALC882_ASUS_A7M),
>+	SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_W2JC),
>+	SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG),
>+	SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG),
> 	SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG),
>+	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8  */
> 	SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG),
> 	SND_PCI_QUIRK(0x161f, 0x2054, "Arima W820", ALC882_ARIMA),
>-	SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG),
> 	{}
> };
> 
>@@ -4830,6 +6233,32 @@ static struct alc_config_preset alc882_presets[] = {
> 		.channel_mode = alc882_sixstack_modes,
> 		.input_mux = &alc882_capture_source,
> 	},
>+	[ALC882_W2JC] = {
>+		.mixers = { alc882_w2jc_mixer, alc882_chmode_mixer },
>+		.init_verbs = { alc882_init_verbs, alc882_eapd_verbs,
>+				alc880_gpio1_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc882_dac_nids),
>+		.dac_nids = alc882_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
>+		.channel_mode = alc880_threestack_modes,
>+		.need_dac_fix = 1,
>+		.input_mux = &alc882_capture_source,
>+		.dig_out_nid = ALC882_DIGOUT_NID,
>+	},
>+	[ALC885_MBP3] = {
>+		.mixers = { alc885_mbp3_mixer, alc882_chmode_mixer },
>+		.init_verbs = { alc885_mbp3_init_verbs,
>+				alc880_gpio1_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc882_dac_nids),
>+		.dac_nids = alc882_dac_nids,
>+		.channel_mode = alc885_mbp_6ch_modes,
>+		.num_channel_mode = ARRAY_SIZE(alc885_mbp_6ch_modes),
>+		.input_mux = &alc882_capture_source,
>+		.dig_out_nid = ALC882_DIGOUT_NID,
>+		.dig_in_nid = ALC882_DIGIN_NID,
>+		.unsol_event = alc885_mbp3_unsol_event,
>+		.init_hook = alc885_mbp3_automute,
>+	},
> 	[ALC885_MACPRO] = {
> 		.mixers = { alc882_macpro_mixer },
> 		.init_verbs = { alc882_macpro_init_verbs },
>@@ -4840,9 +6269,91 @@ static struct alc_config_preset alc882_presets[] = {
> 		.num_channel_mode = ARRAY_SIZE(alc882_ch_modes),
> 		.channel_mode = alc882_ch_modes,
> 		.input_mux = &alc882_capture_source,
>+		.init_hook = alc885_macpro_init_hook,
> 	},
>+	[ALC885_IMAC24] = {
>+		.mixers = { alc885_imac24_mixer },
>+		.init_verbs = { alc885_imac24_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc882_dac_nids),
>+		.dac_nids = alc882_dac_nids,
>+		.dig_out_nid = ALC882_DIGOUT_NID,
>+		.dig_in_nid = ALC882_DIGIN_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc882_ch_modes),
>+		.channel_mode = alc882_ch_modes,
>+		.input_mux = &alc882_capture_source,
>+		.unsol_event = alc885_imac24_unsol_event,
>+		.init_hook = alc885_imac24_init_hook,
>+	},
>+	[ALC882_TARGA] = {
>+		.mixers = { alc882_targa_mixer, alc882_chmode_mixer,
>+			    alc882_capture_mixer },
>+		.init_verbs = { alc882_init_verbs, alc882_targa_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,
>+		.capsrc_nids = alc882_capsrc_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc882_3ST_6ch_modes),
>+		.channel_mode = alc882_3ST_6ch_modes,
>+		.need_dac_fix = 1,
>+		.input_mux = &alc882_capture_source,
>+		.unsol_event = alc882_targa_unsol_event,
>+		.init_hook = alc882_targa_automute,
>+	},
>+	[ALC882_ASUS_A7J] = {
>+		.mixers = { alc882_asus_a7j_mixer, alc882_chmode_mixer,
>+			    alc882_capture_mixer },
>+		.init_verbs = { alc882_init_verbs, alc882_asus_a7j_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,
>+		.capsrc_nids = alc882_capsrc_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc882_3ST_6ch_modes),
>+		.channel_mode = alc882_3ST_6ch_modes,
>+		.need_dac_fix = 1,
>+		.input_mux = &alc882_capture_source,
>+	},	
>+	[ALC882_ASUS_A7M] = {
>+		.mixers = { alc882_asus_a7m_mixer, alc882_chmode_mixer },
>+		.init_verbs = { alc882_init_verbs, alc882_eapd_verbs,
>+				alc880_gpio1_init_verbs,
>+				alc882_asus_a7m_verbs },
>+		.num_dacs = ARRAY_SIZE(alc882_dac_nids),
>+		.dac_nids = alc882_dac_nids,
>+		.dig_out_nid = ALC882_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
>+		.channel_mode = alc880_threestack_modes,
>+		.need_dac_fix = 1,
>+		.input_mux = &alc882_capture_source,
>+	},	
>+};
>+
>+
>+/*
>+ * Pin config fixes
>+ */
>+enum { 
>+	PINFIX_ABIT_AW9D_MAX
>+};
>+
>+static struct alc_pincfg alc882_abit_aw9d_pinfix[] = {
>+	{ 0x15, 0x01080104 }, /* side */
>+	{ 0x16, 0x01011012 }, /* rear */
>+	{ 0x17, 0x01016011 }, /* clfe */
>+	{ }
> };
> 
>+static const struct alc_pincfg *alc882_pin_fixes[] = {
>+	[PINFIX_ABIT_AW9D_MAX] = alc882_abit_aw9d_pinfix,
>+};
>+
>+static struct snd_pci_quirk alc882_pinfix_tbl[] = {
>+	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX),
>+	{}
>+};
> 
> /*
>  * BIOS auto configuration
>@@ -4853,15 +6364,13 @@ static void alc882_auto_set_output_and_unmute(struct hda_codec *codec,
> {
> 	/* set as output */
> 	struct alc_spec *spec = codec->spec;
>-	int idx; 
>-	
>+	int idx;
>+
>+	alc_set_pin_output(codec, nid, pin_type);
> 	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);
> 
> }
>@@ -4871,10 +6380,13 @@ static void alc882_auto_init_multi_out(struct hda_codec *codec)
> 	struct alc_spec *spec = codec->spec;
> 	int i;
> 
>+	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);
> 	for (i = 0; i <= HDA_SIDE; i++) {
>-		hda_nid_t nid = spec->autocfg.line_out_pins[i];	
>+		hda_nid_t nid = spec->autocfg.line_out_pins[i];
>+		int pin_type = get_pin_type(spec->autocfg.line_out_type);
> 		if (nid)
>-			alc882_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
>+			alc882_auto_set_output_and_unmute(codec, nid, pin_type,
>+							  i);
> 	}
> }
> 
>@@ -4885,7 +6397,11 @@ static void alc882_auto_init_hp_out(struct hda_codec *codec)
> 
> 	pin = spec->autocfg.hp_pins[0];
> 	if (pin) /* connect to front */
>-		alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); /* use dac 0 */
>+		/* use dac 0 */
>+		alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
>+	pin = spec->autocfg.speaker_pins[0];
>+	if (pin)
>+		alc882_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
> }
> 
> #define alc882_is_input_pin(nid)	alc880_is_input_pin(nid)
>@@ -4898,14 +6414,50 @@ static void alc882_auto_init_analog_input(struct hda_codec *codec)
> 
> 	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);
>+		unsigned int vref;
>+		if (!nid)
>+			continue;
>+		vref = PIN_IN;
>+		if (1 /*i <= AUTO_PIN_FRONT_MIC*/) {
>+			unsigned int pincap;
>+			pincap = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
>+			if ((pincap >> AC_PINCAP_VREF_SHIFT) &
>+			    AC_PINCAP_VREF_80)
>+				vref = PIN_VREF80;
> 		}
>+		snd_hda_codec_write(codec, nid, 0,
>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, vref);
>+		if (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)
>+			snd_hda_codec_write(codec, nid, 0,
>+					    AC_VERB_SET_AMP_GAIN_MUTE,
>+					    AMP_OUT_MUTE);
>+	}
>+}
>+
>+/* add mic boosts if needed */
>+static int alc_auto_add_mic_boost(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	int err;
>+	hda_nid_t nid;
>+
>+	nid = spec->autocfg.input_pins[AUTO_PIN_MIC];
>+	if (nid && (get_wcaps(codec, nid) & AC_WCAP_IN_AMP)) {
>+		err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+				  "Mic Boost",
>+				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
>+		if (err < 0)
>+			return err;
>+	}
>+	nid = spec->autocfg.input_pins[AUTO_PIN_FRONT_MIC];
>+	if (nid && (get_wcaps(codec, nid) & AC_WCAP_IN_AMP)) {
>+		err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+				  "Front Mic Boost",
>+				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
>+		if (err < 0)
>+			return err;
> 	}
>+	return 0;
> }
> 
> /* almost identical with ALC880 parser... */
>@@ -4916,20 +6468,32 @@ static int alc882_parse_auto_config(struct hda_codec *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;
>+	else if (!err)
>+		return 0; /* no config found */
>+
>+	err = alc_auto_add_mic_boost(codec);
>+	if (err < 0)
>+		return err;
>+
>+	/* hack - override the init verbs */
>+	spec->init_verbs[0] = alc882_auto_init_verbs;
>+
>+	return 1; /* config found */
> }
> 
> /* additional initialization for auto-configuration model */
> static void alc882_auto_init(struct hda_codec *codec)
> {
>+	struct alc_spec *spec = codec->spec;
> 	alc882_auto_init_multi_out(codec);
> 	alc882_auto_init_hp_out(codec);
> 	alc882_auto_init_analog_input(codec);
>+	if (spec->unsol_event)
>+		alc_sku_automute(codec);
> }
> 
>+static int patch_alc883(struct hda_codec *codec); /* called in patch_alc882() */
>+
> static int patch_alc882(struct hda_codec *codec)
> {
> 	struct alc_spec *spec;
>@@ -4951,20 +6515,34 @@ static int patch_alc882(struct hda_codec *codec)
> 		case 0x106b0c00: /* Mac Pro */
> 			board_config = ALC885_MACPRO;
> 			break;
>+		case 0x106b1000: /* iMac 24 */
>+			board_config = ALC885_IMAC24;
>+			break;
>+		case 0x106b00a1: /* Macbook */
>+		case 0x106b2c00: /* Macbook Pro rev3 */
>+			board_config = ALC885_MBP3;
>+			break;
> 		default:
>+			/* ALC889A is handled better as ALC888-compatible */
>+			if (codec->revision_id == 0x100103) {
>+				alc_free(codec);
>+				return patch_alc883(codec);
>+			}
> 			printk(KERN_INFO "hda_codec: Unknown model for ALC882, "
> 		       			 "trying auto-probe from BIOS...\n");
> 			board_config = ALC882_AUTO;
> 		}
> 	}
> 
>+	alc_fix_pincfg(codec, alc882_pinfix_tbl, alc882_pin_fixes);
>+
> 	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) {
>+		} else if (!err) {
> 			printk(KERN_INFO
> 			       "hda_codec: Cannot set up configuration "
> 			       "from BIOS.  Using base mode...\n");
>@@ -4975,39 +6553,53 @@ static int patch_alc882(struct hda_codec *codec)
> 	if (board_config != ALC882_AUTO)
> 		setup_preset(spec, &alc882_presets[board_config]);
> 
>-	if (board_config == ALC885_MACPRO) {
>-		alc882_gpio_mute(codec, 0, 0);
>-		alc882_gpio_mute(codec, 1, 0);
>+	if (codec->vendor_id == 0x10ec0885) {
>+		spec->stream_name_analog = "ALC885 Analog";
>+		spec->stream_name_digital = "ALC885 Digital";
>+	} else {
>+		spec->stream_name_analog = "ALC882 Analog";
>+		spec->stream_name_digital = "ALC882 Digital";
> 	}
> 
>-	spec->stream_name_analog = "ALC882 Analog";
> 	spec->stream_analog_playback = &alc882_pcm_analog_playback;
> 	spec->stream_analog_capture = &alc882_pcm_analog_capture;
>+	/* FIXME: setup DAC5 */
>+	/*spec->stream_analog_alt_playback = &alc880_pcm_analog_alt_playback;*/
>+	spec->stream_analog_alt_capture = &alc880_pcm_analog_alt_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) {
>+	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 */
>+		/* get type */
>+		wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
> 		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->capsrc_nids = alc882_capsrc_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->capsrc_nids = alc882_capsrc_nids;
> 			spec->mixers[spec->num_mixers] = alc882_capture_mixer;
> 			spec->num_mixers++;
> 		}
> 	}
> 
>+	spec->vmaster_nid = 0x0c;
>+
> 	codec->patch_ops = alc_patch_ops;
> 	if (board_config == ALC882_AUTO)
> 		spec->init_hook = alc882_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	if (!spec->loopback.amplist)
>+		spec->loopback.amplist = alc882_loopbacks;
>+#endif
> 
> 	return 0;
> }
>@@ -5028,13 +6620,16 @@ static int patch_alc882(struct hda_codec *codec)
> 
> static hda_nid_t alc883_dac_nids[4] = {
> 	/* front, rear, clfe, rear_surr */
>-	0x02, 0x04, 0x03, 0x05
>+	0x02, 0x03, 0x04, 0x05
> };
> 
> static hda_nid_t alc883_adc_nids[2] = {
> 	/* ADC1-2 */
> 	0x08, 0x09,
> };
>+
>+static hda_nid_t alc883_capsrc_nids[2] = { 0x23, 0x22 };
>+
> /* input MUX */
> /* FIXME: should be a matrix-type input source selection */
> 
>@@ -5047,34 +6642,48 @@ static struct hda_input_mux alc883_capture_source = {
> 		{ "CD", 0x4 },
> 	},
> };
>+
>+static struct hda_input_mux alc883_3stack_6ch_intel = {
>+	.num_items = 4,
>+	.items = {
>+		{ "Mic", 0x1 },
>+		{ "Front Mic", 0x0 },
>+		{ "Line", 0x2 },
>+		{ "CD", 0x4 },
>+	},
>+};
>+
>+static struct hda_input_mux alc883_lenovo_101e_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "Mic", 0x1 },
>+		{ "Line", 0x2 },
>+	},
>+};
>+
>+static struct hda_input_mux alc883_lenovo_nb0763_capture_source = {
>+	.num_items = 4,
>+	.items = {
>+		{ "Mic", 0x0 },
>+		{ "iMic", 0x1 },
>+		{ "Line", 0x2 },
>+		{ "CD", 0x4 },
>+	},
>+};
>+
>+static struct hda_input_mux alc883_fujitsu_pi2515_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "Mic", 0x0 },
>+		{ "Int Mic", 0x1 },
>+	},
>+};
>+
> #define alc883_mux_enum_info alc_mux_enum_info
> #define alc883_mux_enum_get alc_mux_enum_get
>+/* ALC883 has the ALC882-type input selection */
>+#define alc883_mux_enum_put alc882_mux_enum_put
> 
>-static int alc883_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;
>-}
> /*
>  * 2ch mode
>  */
>@@ -5094,6 +6703,18 @@ static struct hda_verb alc883_3ST_ch2_init[] = {
> };
> 
> /*
>+ * 4ch mode
>+ */
>+static struct hda_verb alc883_3ST_ch4_init[] = {
>+	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
>+	{ 0x18, 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 },
>+	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },
>+	{ } /* end */
>+};
>+
>+/*
>  * 6ch mode
>  */
> static struct hda_verb alc883_3ST_ch6_init[] = {
>@@ -5106,12 +6727,55 @@ static struct hda_verb alc883_3ST_ch6_init[] = {
> 	{ } /* end */
> };
> 
>-static struct hda_channel_mode alc883_3ST_6ch_modes[2] = {
>+static struct hda_channel_mode alc883_3ST_6ch_modes[3] = {
> 	{ 2, alc883_3ST_ch2_init },
>+	{ 4, alc883_3ST_ch4_init },
> 	{ 6, alc883_3ST_ch6_init },
> };
> 
> /*
>+ * 2ch mode
>+ */
>+static struct hda_verb alc883_3ST_ch2_intel_init[] = {
>+	{ 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 },
>+	{ } /* end */
>+};
>+
>+/*
>+ * 4ch mode
>+ */
>+static struct hda_verb alc883_3ST_ch4_intel_init[] = {
>+	{ 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 },
>+	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },
>+	{ } /* end */
>+};
>+
>+/*
>+ * 6ch mode
>+ */
>+static struct hda_verb alc883_3ST_ch6_intel_init[] = {
>+	{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ 0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
>+	{ 0x19, AC_VERB_SET_CONNECT_SEL, 0x02 },
>+	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
>+	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },
>+	{ } /* end */
>+};
>+
>+static struct hda_channel_mode alc883_3ST_6ch_intel_modes[3] = {
>+	{ 2, alc883_3ST_ch2_intel_init },
>+	{ 4, alc883_3ST_ch4_intel_init },
>+	{ 6, alc883_3ST_ch6_intel_init },
>+};
>+
>+/*
>  * 6ch mode
>  */
> static struct hda_verb alc883_sixstack_ch6_init[] = {
>@@ -5189,6 +6853,90 @@ static struct snd_kcontrol_new alc883_base_mixer[] = {
> 	{ } /* end */
> };
> 
>+static struct snd_kcontrol_new alc883_mitac_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 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", 0x15, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, 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_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	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,
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 2,
>+		.info = alc883_mux_enum_info,
>+		.get = alc883_mux_enum_get,
>+		.put = alc883_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc883_clevo_m720_mixer[] = {
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	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,
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 2,
>+		.info = alc883_mux_enum_info,
>+		.get = alc883_mux_enum_get,
>+		.put = alc883_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc883_2ch_fujitsu_pi2515_mixer[] = {
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	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,
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 2,
>+		.info = alc883_mux_enum_info,
>+		.get = alc883_mux_enum_get,
>+		.put = alc883_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
> static struct snd_kcontrol_new alc883_3ST_2ch_mixer[] = {
> 	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
> 	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
>@@ -5259,6 +7007,45 @@ static struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = {
> 	{ } /* end */
> };
> 
>+static struct snd_kcontrol_new alc883_3ST_6ch_intel_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", 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("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Front Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, 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", 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,
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 2,
>+		.info = alc883_mux_enum_info,
>+		.get = alc883_mux_enum_get,
>+		.put = alc883_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
> static struct snd_kcontrol_new alc883_fivestack_mixer[] = {
> 	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>@@ -5327,7 +7114,7 @@ static struct snd_kcontrol_new alc883_tagra_mixer[] = {
> 		.put = alc883_mux_enum_put,
> 	},
> 	{ } /* end */
>-};	
>+};
> 
> static struct snd_kcontrol_new alc883_tagra_2ch_mixer[] = {
> 	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>@@ -5338,6 +7125,9 @@ static struct snd_kcontrol_new alc883_tagra_2ch_mixer[] = {
> 	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
> 	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
> 	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
> 	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),
>@@ -5352,32 +7142,41 @@ static struct snd_kcontrol_new alc883_tagra_2ch_mixer[] = {
> 		.put = alc883_mux_enum_put,
> 	},
> 	{ } /* end */
>-};	
>+};
> 
>-static struct snd_kcontrol_new alc888_6st_hp_mixer[] = {
>+static struct snd_kcontrol_new alc883_lenovo_101e_2ch_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", 0x0e, 0x0, HDA_OUTPUT),
>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0e, 2, HDA_INPUT),
>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0d, 1, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0d, 2, 0x0, HDA_OUTPUT),
>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0d, 1, 2, HDA_INPUT),
>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0d, 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("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
> 	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, 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,
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 1,
>+		.info = alc883_mux_enum_info,
>+		.get = alc883_mux_enum_get,
>+		.put = alc883_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc883_lenovo_nb0763_mixer[] = {
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 2, HDA_INPUT),
>+	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("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_VOLUME("Mic Boost", 0x18, 0, 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_VOLUME("Front Mic Boost", 0x19, 0, 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("iMic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("iMic Playback Switch", 0x0b, 0x1, HDA_INPUT),
> 	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),
>@@ -5394,28 +7193,41 @@ static struct snd_kcontrol_new alc888_6st_hp_mixer[] = {
> 	{ } /* end */
> };
> 
>-static struct snd_kcontrol_new alc888_3st_hp_mixer[] = {
>+static struct snd_kcontrol_new alc883_medion_md2_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", 0x0e, 0x0, HDA_OUTPUT),
>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0e, 2, HDA_INPUT),
>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0d, 1, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0d, 2, 0x0, HDA_OUTPUT),
>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0d, 1, 2, HDA_INPUT),
>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0d, 2, 2, HDA_INPUT),
>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Front 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("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
>+	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,
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 2,
>+		.info = alc883_mux_enum_info,
>+		.get = alc883_mux_enum_get,
>+		.put = alc883_mux_enum_put,
>+	},
>+	{ } /* end */
>+};	
>+
>+static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
> 	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_VOLUME("Mic Boost", 0x18, 0, 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_VOLUME("Front Mic Boost", 0x19, 0, 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", 0x08, 0x0, HDA_INPUT),
> 	HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
> 	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
>@@ -5467,11 +7279,12 @@ static struct hda_verb alc883_init_verbs[] = {
> 	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
> 	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
> 
>-	{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)},
>+	/* mute analog input loopbacks */
>+	{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)},
> 
> 	/* Front Pin: output 0 (0x0c) */
> 	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>@@ -5520,6 +7333,96 @@ static struct hda_verb alc883_init_verbs[] = {
> 	{ }
> };
> 
>+/* toggle speaker-output according to the hp-jack state */
>+static void alc883_mitac_hp_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x15, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+}
>+
>+/* auto-toggle front mic */
>+/*
>+static void alc883_mitac_mic_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+	present = snd_hda_codec_read(codec, 0x18, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits);
>+}
>+*/
>+
>+static void alc883_mitac_automute(struct hda_codec *codec)
>+{
>+	alc883_mitac_hp_automute(codec);
>+	/* alc883_mitac_mic_automute(codec); */
>+}
>+
>+static void alc883_mitac_unsol_event(struct hda_codec *codec,
>+					   unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case ALC880_HP_EVENT:
>+		alc883_mitac_hp_automute(codec);
>+		break;
>+	case ALC880_MIC_EVENT:
>+		/* alc883_mitac_mic_automute(codec); */
>+		break;
>+	}
>+}
>+
>+static struct hda_verb alc883_mitac_verbs[] = {
>+	/* HP */
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	/* Subwoofer */
>+	{0x17, AC_VERB_SET_CONNECT_SEL, 0x02},
>+	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+
>+	/* enable unsolicited event */
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	/* {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN}, */
>+
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc883_clevo_m720_verbs[] = {
>+	/* HP */
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	/* Int speaker */
>+	{0x14, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+
>+	/* enable unsolicited event */
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN},
>+
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc883_2ch_fujitsu_pi2515_verbs[] = {
>+	/* HP */
>+	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	/* Subwoofer */
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+
>+	/* enable unsolicited event */
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+
>+	{ } /* end */
>+};
>+
> static struct hda_verb alc883_tagra_verbs[] = {
> 	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
> 	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>@@ -5532,25 +7435,59 @@ static struct hda_verb alc883_tagra_verbs[] = {
> 	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
> 
> 	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x03}, 
>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03}, 
>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x03}, 
>+	{0x01, AC_VERB_SET_GPIO_MASK, 0x03},
>+	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03},
>+	{0x01, AC_VERB_SET_GPIO_DATA, 0x03},
> 
> 	{ } /* end */
> };
> 
>-static struct hda_verb alc888_6st_hp_verbs[] = {
>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},	/* Front: output 0 (0x0c) */
>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x02},	/* Rear : output 2 (0x0e) */
>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x01},	/* CLFE : output 1 (0x0d) */
>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x03},	/* Side : output 3 (0x0f) */
>-	{ }
>+static struct hda_verb alc883_lenovo_101e_verbs[] = {
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_FRONT_EVENT|AC_USRSP_EN},
>+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT|AC_USRSP_EN},
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc883_lenovo_nb0763_verbs[] = {
>+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc888_lenovo_ms7195_verbs[] = {
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_FRONT_EVENT | AC_USRSP_EN},
>+	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT    | AC_USRSP_EN},
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc883_haier_w66_verbs[] = {
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+
>+	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{ } /* end */
> };
> 
> static struct hda_verb alc888_3st_hp_verbs[] = {
> 	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},	/* Front: output 0 (0x0c) */
>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Rear : output 1 (0x0d) */
>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x02},	/* CLFE : output 2 (0x0e) */
>+	{0x16, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Rear : output 1 (0x0d) */
>+	{0x18, AC_VERB_SET_CONNECT_SEL, 0x02},	/* CLFE : output 2 (0x0e) */
>+	{ }
>+};
>+
>+static struct hda_verb alc888_6st_dell_verbs[] = {
>+	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
> 	{ }
> };
> 
>@@ -5575,18 +7512,80 @@ static struct hda_channel_mode alc888_3st_hp_modes[2] = {
> 	{ 6, alc888_3st_hp_6ch_init },
> };
> 
>+/* toggle front-jack and RCA according to the hp-jack state */
>+static void alc888_lenovo_ms7195_front_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+ 
>+ 	present = snd_hda_codec_read(codec, 0x1b, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+}
>+
>+/* toggle RCA according to the front-jack state */
>+static void alc888_lenovo_ms7195_rca_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+ 
>+ 	present = snd_hda_codec_read(codec, 0x14, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+}
>+
>+static void alc883_lenovo_ms7195_unsol_event(struct hda_codec *codec,
>+					     unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc888_lenovo_ms7195_front_automute(codec);
>+	if ((res >> 26) == ALC880_FRONT_EVENT)
>+		alc888_lenovo_ms7195_rca_automute(codec);
>+}
>+
>+static struct hda_verb alc883_medion_md2_verbs[] = {
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	{ } /* end */
>+};
>+
>+/* toggle speaker-output according to the hp-jack state */
>+static void alc883_medion_md2_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+ 
>+ 	present = snd_hda_codec_read(codec, 0x14, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+}
>+
>+static void alc883_medion_md2_unsol_event(struct hda_codec *codec,
>+					  unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc883_medion_md2_automute(codec);
>+}
>+
> /* toggle speaker-output according to the hp-jack state */
> static void alc883_tagra_automute(struct hda_codec *codec)
> {
>  	unsigned int present;
>+	unsigned char bits;
> 
>  	present = snd_hda_codec_read(codec, 0x14, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>-	snd_hda_codec_amp_update(codec, 0x1b, 0, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_amp_update(codec, 0x1b, 1, HDA_OUTPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_write(codec, 1, 0, AC_VERB_SET_GPIO_DATA, present ? 1 : 3);
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+	snd_hda_codec_write_cache(codec, 1, 0, AC_VERB_SET_GPIO_DATA,
>+				  present ? 1 : 3);
> }
> 
> static void alc883_tagra_unsol_event(struct hda_codec *codec, unsigned int res)
>@@ -5595,6 +7594,187 @@ static void alc883_tagra_unsol_event(struct hda_codec *codec, unsigned int res)
> 		alc883_tagra_automute(codec);
> }
> 
>+/* toggle speaker-output according to the hp-jack state */
>+static void alc883_clevo_m720_hp_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+	present = snd_hda_codec_read(codec, 0x15, 0, AC_VERB_GET_PIN_SENSE, 0)
>+		& AC_PINSENSE_PRESENCE;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc883_clevo_m720_mic_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x18, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+}
>+
>+static void alc883_clevo_m720_automute(struct hda_codec *codec)
>+{
>+	alc883_clevo_m720_hp_automute(codec);
>+	alc883_clevo_m720_mic_automute(codec);
>+}
>+
>+static void alc883_clevo_m720_unsol_event(struct hda_codec *codec,
>+					   unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case ALC880_HP_EVENT:
>+		alc883_clevo_m720_hp_automute(codec);
>+		break;
>+	case ALC880_MIC_EVENT:
>+		alc883_clevo_m720_mic_automute(codec);
>+		break;
>+	}
>+}
>+
>+/* toggle speaker-output according to the hp-jack state */
>+static void alc883_2ch_fujitsu_pi2515_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+	unsigned char bits;
>+
>+ 	present = snd_hda_codec_read(codec, 0x14, 0, AC_VERB_GET_PIN_SENSE, 0)
>+		& AC_PINSENSE_PRESENCE;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc883_2ch_fujitsu_pi2515_unsol_event(struct hda_codec *codec,
>+						  unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc883_2ch_fujitsu_pi2515_automute(codec);
>+}
>+
>+static void alc883_haier_w66_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+	present = snd_hda_codec_read(codec, 0x1b, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	bits = present ? 0x80 : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 0x80, bits);
>+}
>+
>+static void alc883_haier_w66_unsol_event(struct hda_codec *codec,
>+					 unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc883_haier_w66_automute(codec);
>+}
>+
>+static void alc883_lenovo_101e_ispeaker_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+	unsigned char bits;
>+
>+ 	present = snd_hda_codec_read(codec, 0x14, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc883_lenovo_101e_all_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+	unsigned char bits;
>+
>+ 	present = snd_hda_codec_read(codec, 0x1b, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc883_lenovo_101e_unsol_event(struct hda_codec *codec,
>+					   unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc883_lenovo_101e_all_automute(codec);
>+	if ((res >> 26) == ALC880_FRONT_EVENT)
>+		alc883_lenovo_101e_ispeaker_automute(codec);
>+}
>+
>+/* toggle speaker-output according to the hp-jack state */
>+static void alc883_acer_aspire_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+ 
>+ 	present = snd_hda_codec_read(codec, 0x14, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+}
>+
>+static void alc883_acer_aspire_unsol_event(struct hda_codec *codec,
>+					   unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc883_acer_aspire_automute(codec);
>+}
>+
>+static struct hda_verb alc883_acer_eapd_verbs[] = {
>+	/* HP Pin: output 0 (0x0c) */
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	/* Front Pin: output 0 (0x0c) */
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00},
>+        /* eanable EAPD on medion laptop */
>+	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},
>+	{0x20, AC_VERB_SET_PROC_COEF, 0x3050},
>+	/* enable unsolicited event */
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	{ }
>+};
>+
>+static void alc888_6st_dell_front_automute(struct hda_codec *codec)
>+{
>+ 	unsigned int present;
>+ 
>+ 	present = snd_hda_codec_read(codec, 0x1b, 0,
>+				AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
>+				HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 0,
>+				HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+}
>+
>+static void alc888_6st_dell_unsol_event(struct hda_codec *codec,
>+					     unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case ALC880_HP_EVENT:
>+		printk("hp_event\n");
>+		alc888_6st_dell_front_automute(codec);
>+		break;
>+	}
>+}
>+
> /*
>  * generic initialization of ADC, input mixers and output mixers
>  */
>@@ -5607,17 +7787,17 @@ static struct hda_verb alc883_auto_init_verbs[] = {
> 	{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
>+	/* Mute 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)
>+	 * 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)},
>+	{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)},
> 
> 	/*
> 	 * Set up output mixers (0x0c - 0x0f)
>@@ -5646,14 +7826,14 @@ static struct hda_verb alc883_auto_init_verbs[] = {
> 	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
> 	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
> 	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
>-	//{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
>+	/* {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)}, */
> 	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
> 	/* Input mixer2 */
> 	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
> 	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
> 	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
>-	//{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
>+	/* {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)}, */
>+	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
> 
> 	{ }
> };
>@@ -5668,7 +7848,6 @@ static struct snd_kcontrol_new alc883_capture_mixer[] = {
> 		.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",
>@@ -5680,9 +7859,14 @@ static struct snd_kcontrol_new alc883_capture_mixer[] = {
> 	{ } /* end */
> };
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+#define alc883_loopbacks	alc880_loopbacks
>+#endif
>+
> /* pcm configuration: identiacal with ALC880 */
> #define alc883_pcm_analog_playback	alc880_pcm_analog_playback
> #define alc883_pcm_analog_capture	alc880_pcm_analog_capture
>+#define alc883_pcm_analog_alt_capture	alc880_pcm_analog_alt_capture
> #define alc883_pcm_digital_playback	alc880_pcm_digital_playback
> #define alc883_pcm_digital_capture	alc880_pcm_digital_capture
> 
>@@ -5697,38 +7881,80 @@ static const char *alc883_models[ALC883_MODEL_LAST] = {
> 	[ALC883_TARGA_DIG]	= "targa-dig",
> 	[ALC883_TARGA_2ch_DIG]	= "targa-2ch-dig",
> 	[ALC883_ACER]		= "acer",
>+	[ALC883_ACER_ASPIRE]	= "acer-aspire",
> 	[ALC883_MEDION]		= "medion",
>+	[ALC883_MEDION_MD2]	= "medion-md2",
> 	[ALC883_LAPTOP_EAPD]	= "laptop-eapd",
>-	[ALC888_6ST_HP]		= "6stack-hp",
>+	[ALC883_LENOVO_101E_2ch] = "lenovo-101e",
>+	[ALC883_LENOVO_NB0763]	= "lenovo-nb0763",
>+	[ALC888_LENOVO_MS7195_DIG] = "lenovo-ms7195-dig",
>+	[ALC883_HAIER_W66] 	= "haier-w66",
> 	[ALC888_3ST_HP]		= "3stack-hp",
>+	[ALC888_6ST_DELL]	= "6stack-dell",
>+	[ALC883_MITAC]		= "mitac",
>+	[ALC883_CLEVO_M720]	= "clevo-m720",
>+	[ALC883_FUJITSU_PI2515] = "fujitsu-pi2515",
>+	[ALC883_3ST_6ch_INTEL]	= "3stack-6ch-intel",
> 	[ALC883_AUTO]		= "auto",
> };
> 
> static struct snd_pci_quirk alc883_cfg_tbl[] = {
> 	SND_PCI_QUIRK(0x1019, 0x6668, "ECS", ALC883_3ST_6ch_DIG),
>-	SND_PCI_QUIRK(0x108e, 0x534d, NULL, ALC883_3ST_6ch),
>-	SND_PCI_QUIRK(0x1558, 0, "Clevo laptop", ALC883_LAPTOP_EAPD),
>+	SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_ACER_ASPIRE),
>+	SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE),
>+	SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE),
>+	SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
>+	SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
>+	SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
>+	SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP),
>+	SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP),
>+	SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG),
>+	SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG),
>+	SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG),
> 	SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG),
>-	SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG),
>-	SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG),
>-	SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG),
>+	SND_PCI_QUIRK(0x1071, 0x8253, "Mitac 8252d", ALC883_MITAC),
>+	SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD),
>+	SND_PCI_QUIRK(0x108e, 0x534d, NULL, ALC883_3ST_6ch),
>+	SND_PCI_QUIRK(0x1458, 0xa002, "MSI", ALC883_6ST_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x0349, "MSI", ALC883_TARGA_2ch_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x040d, "MSI", ALC883_TARGA_2ch_DIG),
> 	SND_PCI_QUIRK(0x1462, 0x0579, "MSI", ALC883_TARGA_2ch_DIG),
>-	SND_PCI_QUIRK(0x1462, 0x3ef9, "MSI", ALC883_TARGA_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x2fb3, "MSI", ALC883_TARGA_2ch_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x3729, "MSI S420", ALC883_TARGA_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x3783, "NEC S970", ALC883_TARGA_DIG),
> 	SND_PCI_QUIRK(0x1462, 0x3b7f, "MSI", ALC883_TARGA_2ch_DIG),
>-	SND_PCI_QUIRK(0x1462, 0x3fcc, "MSI", ALC883_TARGA_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x3ef9, "MSI", ALC883_TARGA_DIG),
> 	SND_PCI_QUIRK(0x1462, 0x3fc1, "MSI", ALC883_TARGA_DIG),
> 	SND_PCI_QUIRK(0x1462, 0x3fc3, "MSI", ALC883_TARGA_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x3fcc, "MSI", ALC883_TARGA_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x3fdf, "MSI", ALC883_TARGA_DIG),
> 	SND_PCI_QUIRK(0x1462, 0x4314, "MSI", ALC883_TARGA_DIG),
> 	SND_PCI_QUIRK(0x1462, 0x4319, "MSI", ALC883_TARGA_DIG),
> 	SND_PCI_QUIRK(0x1462, 0x4324, "MSI", ALC883_TARGA_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x7250, "MSI", ALC883_6ST_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x7267, "MSI", ALC883_3ST_6ch_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG),
>+	SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG),
> 	SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG),
>-	SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER),
>+	SND_PCI_QUIRK(0x147b, 0x1083, "Abit IP35-PRO", ALC883_6ST_DIG),
>+	SND_PCI_QUIRK(0x1558, 0x0721, "Clevo laptop M720R", ALC883_CLEVO_M720),
>+	SND_PCI_QUIRK(0x1558, 0x0722, "Clevo laptop M720SR", ALC883_CLEVO_M720),
>+	SND_PCI_QUIRK(0x1558, 0, "Clevo laptop", ALC883_LAPTOP_EAPD),
>+	SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),
> 	SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),
>-	SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD),
>+	SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515),
>+	SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch),
>+	SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763),
>+	SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763),
>+	SND_PCI_QUIRK(0x17aa, 0x3bfd, "Lenovo NB0763", ALC883_LENOVO_NB0763),
>+	SND_PCI_QUIRK(0x17c0, 0x4071, "MEDION MD2", ALC883_MEDION_MD2),
>+	SND_PCI_QUIRK(0x17f2, 0x5000, "Albatron KI690-AM2", ALC883_6ST_DIG),
>+	SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),
>+	SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL),
>+	SND_PCI_QUIRK(0x8086, 0x0002, "DG33FBC", ALC883_3ST_6ch_INTEL),
> 	SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch),
>-	SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC888_6ST_HP),
>-	SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP),
>-	SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP),
> 	{}
> };
> 
>@@ -5739,8 +7965,6 @@ static struct alc_config_preset alc883_presets[] = {
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
> 		.dig_out_nid = ALC883_DIGOUT_NID,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
> 		.dig_in_nid = ALC883_DIGIN_NID,
> 		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
> 		.channel_mode = alc883_3ST_2ch_modes,
>@@ -5752,34 +7976,40 @@ static struct alc_config_preset alc883_presets[] = {
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
> 		.dig_out_nid = ALC883_DIGOUT_NID,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
> 		.dig_in_nid = ALC883_DIGIN_NID,
> 		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
> 		.channel_mode = alc883_3ST_6ch_modes,
> 		.need_dac_fix = 1,
> 		.input_mux = &alc883_capture_source,
>-	},	
>+	},
> 	[ALC883_3ST_6ch] = {
> 		.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },
> 		.init_verbs = { alc883_init_verbs },
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
> 		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
> 		.channel_mode = alc883_3ST_6ch_modes,
> 		.need_dac_fix = 1,
> 		.input_mux = &alc883_capture_source,
>-	},	
>+	},
>+	[ALC883_3ST_6ch_INTEL] = {
>+		.mixers = { alc883_3ST_6ch_intel_mixer, alc883_chmode_mixer },
>+		.init_verbs = { alc883_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
>+		.dac_nids = alc883_dac_nids,
>+		.dig_out_nid = ALC883_DIGOUT_NID,
>+		.dig_in_nid = ALC883_DIGIN_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_intel_modes),
>+		.channel_mode = alc883_3ST_6ch_intel_modes,
>+		.need_dac_fix = 1,
>+		.input_mux = &alc883_3stack_6ch_intel,
>+	},
> 	[ALC883_6ST_DIG] = {
> 		.mixers = { alc883_base_mixer, alc883_chmode_mixer },
> 		.init_verbs = { alc883_init_verbs },
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
> 		.dig_out_nid = ALC883_DIGOUT_NID,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
> 		.dig_in_nid = ALC883_DIGIN_NID,
> 		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
> 		.channel_mode = alc883_sixstack_modes,
>@@ -5791,8 +8021,6 @@ static struct alc_config_preset alc883_presets[] = {
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
> 		.dig_out_nid = ALC883_DIGOUT_NID,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
> 		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
> 		.channel_mode = alc883_3ST_6ch_modes,
> 		.need_dac_fix = 1,
>@@ -5806,8 +8034,6 @@ static struct alc_config_preset alc883_presets[] = {
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
> 		.dig_out_nid = ALC883_DIGOUT_NID,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
> 		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
> 		.channel_mode = alc883_3ST_2ch_modes,
> 		.input_mux = &alc883_capture_source,
>@@ -5815,8 +8041,7 @@ static struct alc_config_preset alc883_presets[] = {
> 		.init_hook = alc883_tagra_automute,
> 	},
> 	[ALC883_ACER] = {
>-		.mixers = { alc883_base_mixer,
>-			    alc883_chmode_mixer },
>+		.mixers = { alc883_base_mixer },
> 		/* On TravelMate laptops, GPIO 0 enables the internal speaker
> 		 * and the headphone jack.  Turn this on and rely on the
> 		 * standard mute methods whenever the user wants to turn
>@@ -5825,12 +8050,22 @@ static struct alc_config_preset alc883_presets[] = {
> 		.init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs },
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
> 		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
> 		.channel_mode = alc883_3ST_2ch_modes,
> 		.input_mux = &alc883_capture_source,
> 	},
>+	[ALC883_ACER_ASPIRE] = {
>+		.mixers = { alc883_acer_aspire_mixer },
>+		.init_verbs = { alc883_init_verbs, alc883_acer_eapd_verbs },
>+		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
>+		.dac_nids = alc883_dac_nids,
>+		.dig_out_nid = ALC883_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
>+		.channel_mode = alc883_3ST_2ch_modes,
>+		.input_mux = &alc883_capture_source,
>+		.unsol_event = alc883_acer_aspire_unsol_event,
>+		.init_hook = alc883_acer_aspire_automute,
>+	},
> 	[ALC883_MEDION] = {
> 		.mixers = { alc883_fivestack_mixer,
> 			    alc883_chmode_mixer },
>@@ -5838,49 +8073,138 @@ static struct alc_config_preset alc883_presets[] = {
> 				alc883_medion_eapd_verbs },
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
> 		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
> 		.channel_mode = alc883_sixstack_modes,
> 		.input_mux = &alc883_capture_source,
> 	},
>+	[ALC883_MEDION_MD2] = {
>+		.mixers = { alc883_medion_md2_mixer},
>+		.init_verbs = { alc883_init_verbs, alc883_medion_md2_verbs},
>+		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
>+		.dac_nids = alc883_dac_nids,
>+		.dig_out_nid = ALC883_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
>+		.channel_mode = alc883_3ST_2ch_modes,
>+		.input_mux = &alc883_capture_source,
>+		.unsol_event = alc883_medion_md2_unsol_event,
>+		.init_hook = alc883_medion_md2_automute,
>+	},	
> 	[ALC883_LAPTOP_EAPD] = {
>-		.mixers = { alc883_base_mixer,
>-			    alc883_chmode_mixer },
>+		.mixers = { alc883_base_mixer },
> 		.init_verbs = { alc883_init_verbs, alc882_eapd_verbs },
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
> 		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
> 		.channel_mode = alc883_3ST_2ch_modes,
> 		.input_mux = &alc883_capture_source,
> 	},
>-	[ALC888_6ST_HP] = {
>-		.mixers = { alc888_6st_hp_mixer, alc883_chmode_mixer },
>-		.init_verbs = { alc883_init_verbs, alc888_6st_hp_verbs },
>+	[ALC883_CLEVO_M720] = {
>+		.mixers = { alc883_clevo_m720_mixer },
>+		.init_verbs = { alc883_init_verbs, alc883_clevo_m720_verbs },
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
> 		.dig_out_nid = ALC883_DIGOUT_NID,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
>-		.dig_in_nid = ALC883_DIGIN_NID,
>-		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
>-		.channel_mode = alc883_sixstack_modes,
>+		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
>+		.channel_mode = alc883_3ST_2ch_modes,
>+		.input_mux = &alc883_capture_source,
>+		.unsol_event = alc883_clevo_m720_unsol_event,
>+		.init_hook = alc883_clevo_m720_automute,
>+	},
>+	[ALC883_LENOVO_101E_2ch] = {
>+		.mixers = { alc883_lenovo_101e_2ch_mixer},
>+		.init_verbs = { alc883_init_verbs, alc883_lenovo_101e_verbs},
>+		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
>+		.dac_nids = alc883_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
>+		.channel_mode = alc883_3ST_2ch_modes,
>+		.input_mux = &alc883_lenovo_101e_capture_source,
>+		.unsol_event = alc883_lenovo_101e_unsol_event,
>+		.init_hook = alc883_lenovo_101e_all_automute,
>+	},
>+	[ALC883_LENOVO_NB0763] = {
>+		.mixers = { alc883_lenovo_nb0763_mixer },
>+		.init_verbs = { alc883_init_verbs, alc883_lenovo_nb0763_verbs},
>+		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
>+		.dac_nids = alc883_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
>+		.channel_mode = alc883_3ST_2ch_modes,
>+		.need_dac_fix = 1,
>+		.input_mux = &alc883_lenovo_nb0763_capture_source,
>+		.unsol_event = alc883_medion_md2_unsol_event,
>+		.init_hook = alc883_medion_md2_automute,
>+	},
>+	[ALC888_LENOVO_MS7195_DIG] = {
>+		.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },
>+		.init_verbs = { alc883_init_verbs, alc888_lenovo_ms7195_verbs},
>+		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
>+		.dac_nids = alc883_dac_nids,
>+		.dig_out_nid = ALC883_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
>+		.channel_mode = alc883_3ST_6ch_modes,
>+		.need_dac_fix = 1,
> 		.input_mux = &alc883_capture_source,
>+		.unsol_event = alc883_lenovo_ms7195_unsol_event,
>+		.init_hook = alc888_lenovo_ms7195_front_automute,
>+	},
>+	[ALC883_HAIER_W66] = {
>+		.mixers = { alc883_tagra_2ch_mixer},
>+		.init_verbs = { alc883_init_verbs, alc883_haier_w66_verbs},
>+		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
>+		.dac_nids = alc883_dac_nids,
>+		.dig_out_nid = ALC883_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
>+		.channel_mode = alc883_3ST_2ch_modes,
>+		.input_mux = &alc883_capture_source,
>+		.unsol_event = alc883_haier_w66_unsol_event,
>+		.init_hook = alc883_haier_w66_automute,
> 	},
> 	[ALC888_3ST_HP] = {
>-		.mixers = { alc888_3st_hp_mixer, alc883_chmode_mixer },
>+		.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },
> 		.init_verbs = { alc883_init_verbs, alc888_3st_hp_verbs },
> 		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
> 		.dac_nids = alc883_dac_nids,
>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
>-		.adc_nids = alc883_adc_nids,
> 		.num_channel_mode = ARRAY_SIZE(alc888_3st_hp_modes),
> 		.channel_mode = alc888_3st_hp_modes,
> 		.need_dac_fix = 1,
> 		.input_mux = &alc883_capture_source,
> 	},
>+	[ALC888_6ST_DELL] = {
>+		.mixers = { alc883_base_mixer, alc883_chmode_mixer },
>+		.init_verbs = { alc883_init_verbs, alc888_6st_dell_verbs },
>+		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
>+		.dac_nids = alc883_dac_nids,
>+		.dig_out_nid = ALC883_DIGOUT_NID,
>+		.dig_in_nid = ALC883_DIGIN_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
>+		.channel_mode = alc883_sixstack_modes,
>+		.input_mux = &alc883_capture_source,
>+		.unsol_event = alc888_6st_dell_unsol_event,
>+		.init_hook = alc888_6st_dell_front_automute,
>+	},
>+	[ALC883_MITAC] = {
>+		.mixers = { alc883_mitac_mixer },
>+		.init_verbs = { alc883_init_verbs, alc883_mitac_verbs },
>+		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
>+		.dac_nids = alc883_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
>+		.channel_mode = alc883_3ST_2ch_modes,
>+		.input_mux = &alc883_capture_source,
>+		.unsol_event = alc883_mitac_unsol_event,
>+		.init_hook = alc883_mitac_automute,
>+	},
>+	[ALC883_FUJITSU_PI2515] = {
>+		.mixers = { alc883_2ch_fujitsu_pi2515_mixer },
>+		.init_verbs = { alc883_init_verbs,
>+				alc883_2ch_fujitsu_pi2515_verbs},
>+		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
>+		.dac_nids = alc883_dac_nids,
>+		.dig_out_nid = ALC883_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
>+		.channel_mode = alc883_3ST_2ch_modes,
>+		.input_mux = &alc883_fujitsu_pi2515_capture_source,
>+		.unsol_event = alc883_2ch_fujitsu_pi2515_unsol_event,
>+		.init_hook = alc883_2ch_fujitsu_pi2515_automute,
>+	},
> };
> 
> 
>@@ -5893,17 +8217,13 @@ static void alc883_auto_set_output_and_unmute(struct hda_codec *codec,
> {
> 	/* set as output */
> 	struct alc_spec *spec = codec->spec;
>-	int idx; 
>-	
>+	int idx;
>+
>+	alc_set_pin_output(codec, nid, pin_type);
> 	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);
> 
> }
>@@ -5913,10 +8233,13 @@ static void alc883_auto_init_multi_out(struct hda_codec *codec)
> 	struct alc_spec *spec = codec->spec;
> 	int i;
> 
>+	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);
> 	for (i = 0; i <= HDA_SIDE; i++) {
>-		hda_nid_t nid = spec->autocfg.line_out_pins[i];	
>+		hda_nid_t nid = spec->autocfg.line_out_pins[i];
>+		int pin_type = get_pin_type(spec->autocfg.line_out_type);
> 		if (nid)
>-			alc883_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
>+			alc883_auto_set_output_and_unmute(codec, nid, pin_type,
>+							  i);
> 	}
> }
> 
>@@ -5929,6 +8252,9 @@ static void alc883_auto_init_hp_out(struct hda_codec *codec)
> 	if (pin) /* connect to front */
> 		/* use dac 0 */
> 		alc883_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
>+	pin = spec->autocfg.speaker_pins[0];
>+	if (pin)
>+		alc883_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
> }
> 
> #define alc883_is_input_pin(nid)	alc880_is_input_pin(nid)
>@@ -5962,20 +8288,30 @@ static int alc883_parse_auto_config(struct hda_codec *codec)
> 
> 	if (err < 0)
> 		return err;
>-	else if (err > 0)
>-		/* hack - override the init verbs */
>-		spec->init_verbs[0] = alc883_auto_init_verbs;
>-                spec->mixers[spec->num_mixers] = alc883_capture_mixer;
>-		spec->num_mixers++;
>-	return err;
>+	else if (!err)
>+		return 0; /* no config found */
>+
>+	err = alc_auto_add_mic_boost(codec);
>+	if (err < 0)
>+		return err;
>+
>+	/* hack - override the init verbs */
>+	spec->init_verbs[0] = alc883_auto_init_verbs;
>+	spec->mixers[spec->num_mixers] = alc883_capture_mixer;
>+	spec->num_mixers++;
>+
>+	return 1; /* config found */
> }
> 
> /* additional initialization for auto-configuration model */
> static void alc883_auto_init(struct hda_codec *codec)
> {
>+	struct alc_spec *spec = codec->spec;
> 	alc883_auto_init_multi_out(codec);
> 	alc883_auto_init_hp_out(codec);
> 	alc883_auto_init_analog_input(codec);
>+	if (spec->unsol_event)
>+		alc_sku_automute(codec);
> }
> 
> static int patch_alc883(struct hda_codec *codec)
>@@ -5989,6 +8325,8 @@ static int patch_alc883(struct hda_codec *codec)
> 
> 	codec->spec = spec;
> 
>+	alc_fix_pll_init(codec, 0x20, 0x0a, 10);
>+
> 	board_config = snd_hda_check_board_config(codec, ALC883_MODEL_LAST,
> 						  alc883_models,
> 						  alc883_cfg_tbl);
>@@ -6004,7 +8342,7 @@ static int patch_alc883(struct hda_codec *codec)
> 		if (err < 0) {
> 			alc_free(codec);
> 			return err;
>-		} else if (! err) {
>+		} else if (!err) {
> 			printk(KERN_INFO
> 			       "hda_codec: Cannot set up configuration "
> 			       "from BIOS.  Using base mode...\n");
>@@ -6015,22 +8353,44 @@ static int patch_alc883(struct hda_codec *codec)
> 	if (board_config != ALC883_AUTO)
> 		setup_preset(spec, &alc883_presets[board_config]);
> 
>-	spec->stream_name_analog = "ALC883 Analog";
>+	switch (codec->vendor_id) {
>+	case 0x10ec0888:
>+		spec->stream_name_analog = "ALC888 Analog";
>+		spec->stream_name_digital = "ALC888 Digital";
>+		break;
>+	case 0x10ec0889:
>+		spec->stream_name_analog = "ALC889 Analog";
>+		spec->stream_name_digital = "ALC889 Digital";
>+		break;
>+	default:
>+		spec->stream_name_analog = "ALC883 Analog";
>+		spec->stream_name_digital = "ALC883 Digital";
>+		break;
>+	}
>+
> 	spec->stream_analog_playback = &alc883_pcm_analog_playback;
> 	spec->stream_analog_capture = &alc883_pcm_analog_capture;
>+	spec->stream_analog_alt_capture = &alc883_pcm_analog_alt_capture;
> 
>-	spec->stream_name_digital = "ALC883 Digital";
> 	spec->stream_digital_playback = &alc883_pcm_digital_playback;
> 	spec->stream_digital_capture = &alc883_pcm_digital_capture;
> 
>-	if (! spec->adc_nids && spec->input_mux) {
>-		spec->adc_nids = alc883_adc_nids;
>-		spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids);
>-	}
>+	spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids);
>+	spec->adc_nids = alc883_adc_nids;
>+	spec->capsrc_nids = alc883_capsrc_nids;
>+
>+	spec->vmaster_nid = 0x0c;
> 
> 	codec->patch_ops = alc_patch_ops;
> 	if (board_config == ALC883_AUTO)
> 		spec->init_hook = alc883_auto_init;
>+	else if (codec->vendor_id == 0x10ec0888)
>+		spec->init_hook = alc888_coef_init;
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	if (!spec->loopback.amplist)
>+		spec->loopback.amplist = alc883_loopbacks;
>+#endif
> 
> 	return 0;
> }
>@@ -6045,6 +8405,8 @@ static int patch_alc883(struct hda_codec *codec)
> #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_capsrc_nids	alc882_capsrc_nids
>+#define alc262_capsrc_nids_alt	alc882_capsrc_nids_alt
> 
> #define alc262_modes		alc260_modes
> #define alc262_capture_source	alc882_capture_source
>@@ -6063,7 +8425,7 @@ static struct snd_kcontrol_new alc262_base_mixer[] = {
> 	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
> 	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, 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_MUTE("PC Beep 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),
>@@ -6085,19 +8447,105 @@ static struct snd_kcontrol_new alc262_hippo1_mixer[] = {
> 	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
> 	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, 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_MUTE("PC Beep Playback Switch", 0x0b, 0x05, HDA_INPUT), */
> 	/*HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0D, 0x0, HDA_OUTPUT),*/
> 	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
> 	{ } /* end */
> };
> 
>+/* update HP, line and mono-out pins according to the master switch */
>+static void alc262_hp_master_update(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	int val = spec->master_sw;
>+
>+	/* HP & line-out */
>+	snd_hda_codec_write_cache(codec, 0x1b, 0,
>+				  AC_VERB_SET_PIN_WIDGET_CONTROL,
>+				  val ? PIN_HP : 0);
>+	snd_hda_codec_write_cache(codec, 0x15, 0,
>+				  AC_VERB_SET_PIN_WIDGET_CONTROL,
>+				  val ? PIN_HP : 0);
>+	/* mono (speaker) depending on the HP jack sense */
>+	val = val && !spec->jack_present;
>+	snd_hda_codec_write_cache(codec, 0x16, 0,
>+				  AC_VERB_SET_PIN_WIDGET_CONTROL,
>+				  val ? PIN_OUT : 0);
>+}
>+
>+static void alc262_hp_bpc_automute(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	unsigned int presence;
>+	presence = snd_hda_codec_read(codec, 0x1b, 0,
>+				      AC_VERB_GET_PIN_SENSE, 0);
>+	spec->jack_present = !!(presence & AC_PINSENSE_PRESENCE);
>+	alc262_hp_master_update(codec);
>+}
>+
>+static void alc262_hp_bpc_unsol_event(struct hda_codec *codec, unsigned int res)
>+{
>+	if ((res >> 26) != ALC880_HP_EVENT)
>+		return;
>+	alc262_hp_bpc_automute(codec);
>+}
>+
>+static void alc262_hp_wildwest_automute(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	unsigned int presence;
>+	presence = snd_hda_codec_read(codec, 0x15, 0,
>+				      AC_VERB_GET_PIN_SENSE, 0);
>+	spec->jack_present = !!(presence & AC_PINSENSE_PRESENCE);
>+	alc262_hp_master_update(codec);
>+}
>+
>+static void alc262_hp_wildwest_unsol_event(struct hda_codec *codec,
>+					   unsigned int res)
>+{
>+	if ((res >> 26) != ALC880_HP_EVENT)
>+		return;
>+	alc262_hp_wildwest_automute(codec);
>+}
>+
>+static int alc262_hp_master_sw_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;
>+	*ucontrol->value.integer.value = spec->master_sw;
>+	return 0;
>+}
>+
>+static int alc262_hp_master_sw_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;
>+	int val = !!*ucontrol->value.integer.value;
>+
>+	if (val == spec->master_sw)
>+		return 0;
>+	spec->master_sw = val;
>+	alc262_hp_master_update(codec);
>+	return 1;
>+}
>+
> static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Master Playback Switch",
>+		.info = snd_ctl_boolean_mono_info,
>+		.get = alc262_hp_master_sw_get,
>+		.put = alc262_hp_master_sw_put,
>+	},
> 	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 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_MONO("Speaker Playback Volume", 0x0e, 2, 0x0,
>+			      HDA_OUTPUT),
>+	HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x16, 2, 0x0,
>+			    HDA_OUTPUT),
> 	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
> 	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
> 	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
>@@ -6116,12 +8564,21 @@ static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {
> };
> 
> static struct snd_kcontrol_new alc262_HP_BPC_WildWest_mixer[] = {
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Master Playback Switch",
>+		.info = snd_ctl_boolean_mono_info,
>+		.get = alc262_hp_master_sw_get,
>+		.put = alc262_hp_master_sw_put,
>+	},
> 	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
> 	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_MONO("Speaker Playback Volume", 0x0e, 2, 0x0,
>+			      HDA_OUTPUT),
>+	HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x16, 2, 0x0,
>+			    HDA_OUTPUT),
> 	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x02, HDA_INPUT),
> 	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x02, HDA_INPUT),
> 	HDA_CODEC_VOLUME("Front Mic Boost", 0x1a, 0, HDA_INPUT),
>@@ -6141,6 +8598,143 @@ static struct snd_kcontrol_new alc262_HP_BPC_WildWest_option_mixer[] = {
> 	{ } /* end */
> };
> 
>+/* mute/unmute internal speaker according to the hp jack and mute state */
>+static void alc262_hp_t5735_automute(struct hda_codec *codec, int force)
>+{
>+	struct alc_spec *spec = codec->spec;
>+
>+	if (force || !spec->sense_updated) {
>+		unsigned int present;
>+		present = snd_hda_codec_read(codec, 0x15, 0,
>+					     AC_VERB_GET_PIN_SENSE, 0);
>+		spec->jack_present = (present & AC_PINSENSE_PRESENCE) != 0;
>+		spec->sense_updated = 1;
>+	}
>+	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_OUTPUT, 0, HDA_AMP_MUTE,
>+				 spec->jack_present ? HDA_AMP_MUTE : 0);
>+}
>+
>+static void alc262_hp_t5735_unsol_event(struct hda_codec *codec,
>+					unsigned int res)
>+{
>+	if ((res >> 26) != ALC880_HP_EVENT)
>+		return;
>+	alc262_hp_t5735_automute(codec, 1);
>+}
>+
>+static void alc262_hp_t5735_init_hook(struct hda_codec *codec)
>+{
>+	alc262_hp_t5735_automute(codec, 1);
>+}
>+
>+static struct snd_kcontrol_new alc262_hp_t5735_mixer[] = {
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc262_hp_t5735_verbs[] = {
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	{ }
>+};
>+
>+static struct snd_kcontrol_new alc262_hp_rp5700_mixer[] = {
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0e, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x16, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc262_hp_rp5700_verbs[] = {
>+	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
>+	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
>+	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x00 << 8))},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x00 << 8))},
>+	{}
>+};
>+
>+static struct hda_input_mux alc262_hp_rp5700_capture_source = {
>+	.num_items = 1,
>+	.items = {
>+		{ "Line", 0x1 },
>+	},
>+};
>+
>+/* bind hp and internal speaker mute (with plug check) */
>+static int alc262_sony_master_sw_put(struct snd_kcontrol *kcontrol,
>+				     struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>+	long *valp = ucontrol->value.integer.value;
>+	int change;
>+
>+	/* change hp mute */
>+	change = snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
>+					  HDA_AMP_MUTE,
>+					  valp[0] ? 0 : HDA_AMP_MUTE);
>+	change |= snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
>+					   HDA_AMP_MUTE,
>+					   valp[1] ? 0 : HDA_AMP_MUTE);
>+	if (change) {
>+		/* change speaker according to HP jack state */
>+		struct alc_spec *spec = codec->spec;
>+		unsigned int mute;
>+		if (spec->jack_present)
>+			mute = HDA_AMP_MUTE;
>+		else
>+			mute = snd_hda_codec_amp_read(codec, 0x15, 0,
>+						      HDA_OUTPUT, 0);
>+		snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, mute);
>+	}
>+	return change;
>+}
>+
>+static struct snd_kcontrol_new alc262_sony_mixer[] = {
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Master Playback Switch",
>+		.info = snd_hda_mixer_amp_switch_info,
>+		.get = snd_hda_mixer_amp_switch_get,
>+		.put = alc262_sony_master_sw_put,
>+		.private_value = HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT),
>+	},
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("ATAPI Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc262_benq_t31_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("ATAPI Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
>+	{ } /* end */
>+};
>+
> #define alc262_capture_mixer		alc882_capture_mixer
> #define alc262_capture_alt_mixer	alc882_capture_alt_mixer
> 
>@@ -6158,17 +8752,17 @@ static struct hda_verb alc262_init_verbs[] = {
> 	{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
>+	/* Mute 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)
>+	 * 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)},
>+	{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)},
> 
> 	/*
> 	 * Set up output mixers (0x0c - 0x0e)
>@@ -6218,7 +8812,7 @@ static struct hda_verb alc262_init_verbs[] = {
> 	{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))},	
>+	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
> 
> 	{ }
> };
>@@ -6239,35 +8833,36 @@ static struct hda_verb alc262_hippo1_unsol_verbs[] = {
> 	{}
> };
> 
>+static struct hda_verb alc262_sony_unsol_verbs[] = {
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},	// Front Mic
>+
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+};
>+
> /* mute/unmute internal speaker according to the hp jack and mute state */
>-static void alc262_hippo_automute(struct hda_codec *codec, int force)
>+static void alc262_hippo_automute(struct hda_codec *codec)
> {
> 	struct alc_spec *spec = codec->spec;
> 	unsigned int mute;
>+	unsigned int present;
> 
>-	if (force || ! spec->sense_updated) {
>-		unsigned int present;
>-		/* need to execute and sync at first */
>-		snd_hda_codec_read(codec, 0x15, 0, AC_VERB_SET_PIN_SENSE, 0);
>-		present = snd_hda_codec_read(codec, 0x15, 0,
>-				    	 AC_VERB_GET_PIN_SENSE, 0);
>-		spec->jack_present = (present & 0x80000000) != 0;
>-		spec->sense_updated = 1;
>-	}
>+	/* need to execute and sync at first */
>+	snd_hda_codec_read(codec, 0x15, 0, AC_VERB_SET_PIN_SENSE, 0);
>+	present = snd_hda_codec_read(codec, 0x15, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0);
>+	spec->jack_present = (present & 0x80000000) != 0;
> 	if (spec->jack_present) {
> 		/* mute internal speaker */
>-		snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
>-					 0x80, 0x80);
>-		snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
>-					 0x80, 0x80);
>+		snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, HDA_AMP_MUTE);
> 	} else {
> 		/* unmute internal speaker if necessary */
> 		mute = snd_hda_codec_amp_read(codec, 0x15, 0, HDA_OUTPUT, 0);
>-		snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
>-					 0x80, mute & 0x80);
>-		mute = snd_hda_codec_amp_read(codec, 0x15, 1, HDA_OUTPUT, 0);
>-		snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
>-					 0x80, mute & 0x80);
>+		snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, mute);
> 	}
> }
> 
>@@ -6277,37 +8872,27 @@ static void alc262_hippo_unsol_event(struct hda_codec *codec,
> {
> 	if ((res >> 26) != ALC880_HP_EVENT)
> 		return;
>-	alc262_hippo_automute(codec, 1);
>+	alc262_hippo_automute(codec);
> }
> 
>-static void alc262_hippo1_automute(struct hda_codec *codec, int force)
>+static void alc262_hippo1_automute(struct hda_codec *codec)
> {
>-	struct alc_spec *spec = codec->spec;
> 	unsigned int mute;
>+	unsigned int present;
> 
>-	if (force || ! spec->sense_updated) {
>-		unsigned int present;
>-		/* need to execute and sync at first */
>-		snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0);
>-		present = snd_hda_codec_read(codec, 0x1b, 0,
>-				    	 AC_VERB_GET_PIN_SENSE, 0);
>-		spec->jack_present = (present & 0x80000000) != 0;
>-		spec->sense_updated = 1;
>-	}
>-	if (spec->jack_present) {
>+	snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0);
>+	present = snd_hda_codec_read(codec, 0x1b, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0);
>+	present = (present & 0x80000000) != 0;
>+	if (present) {
> 		/* mute internal speaker */
>-		snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
>-					 0x80, 0x80);
>-		snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
>-					 0x80, 0x80);
>+		snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, HDA_AMP_MUTE);
> 	} else {
> 		/* unmute internal speaker if necessary */
> 		mute = snd_hda_codec_amp_read(codec, 0x1b, 0, HDA_OUTPUT, 0);
>-		snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
>-					 0x80, mute & 0x80);
>-		mute = snd_hda_codec_amp_read(codec, 0x1b, 1, HDA_OUTPUT, 0);
>-		snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
>-					 0x80, mute & 0x80);
>+		snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, mute);
> 	}
> }
> 
>@@ -6317,12 +8902,13 @@ static void alc262_hippo1_unsol_event(struct hda_codec *codec,
> {
> 	if ((res >> 26) != ALC880_HP_EVENT)
> 		return;
>-	alc262_hippo1_automute(codec, 1);
>+	alc262_hippo1_automute(codec);
> }
> 
> /*
>  * fujitsu model
>- *  0x14 = headphone/spdif-out, 0x15 = internal speaker
>+ *  0x14 = headphone/spdif-out, 0x15 = internal speaker,
>+ *  0x1b = port replicator headphone out
>  */
> 
> #define ALC_HP_EVENT	0x37
>@@ -6330,13 +8916,22 @@ static void alc262_hippo1_unsol_event(struct hda_codec *codec,
> static struct hda_verb alc262_fujitsu_unsol_verbs[] = {
> 	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
> 	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
>+	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{}
>+};
>+
>+static struct hda_verb alc262_lenovo_3000_unsol_verbs[] = {
>+	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
>+	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
> 	{}
> };
> 
> static struct hda_input_mux alc262_fujitsu_capture_source = {
>-	.num_items = 2,
>+	.num_items = 3,
> 	.items = {
> 		{ "Mic", 0x0 },
>+		{ "Int Mic", 0x1 },
> 		{ "CD", 0x4 },
> 	},
> };
>@@ -6345,43 +8940,56 @@ static struct hda_input_mux alc262_HP_capture_source = {
> 	.num_items = 5,
> 	.items = {
> 		{ "Mic", 0x0 },
>-		{ "Front Mic", 0x3 },
>+		{ "Front Mic", 0x1 },
> 		{ "Line", 0x2 },
> 		{ "CD", 0x4 },
> 		{ "AUX IN", 0x6 },
> 	},
> };
> 
>-/* mute/unmute internal speaker according to the hp jack and mute state */
>+static struct hda_input_mux alc262_HP_D7000_capture_source = {
>+	.num_items = 4,
>+	.items = {
>+		{ "Mic", 0x0 },
>+		{ "Front Mic", 0x2 },
>+		{ "Line", 0x1 },
>+		{ "CD", 0x4 },
>+	},
>+};
>+
>+/* mute/unmute internal speaker according to the hp jacks and mute state */
> static void alc262_fujitsu_automute(struct hda_codec *codec, int force)
> {
> 	struct alc_spec *spec = codec->spec;
> 	unsigned int mute;
> 
>-	if (force || ! spec->sense_updated) {
>+	if (force || !spec->sense_updated) {
> 		unsigned int present;
> 		/* need to execute and sync at first */
> 		snd_hda_codec_read(codec, 0x14, 0, AC_VERB_SET_PIN_SENSE, 0);
>+		/* check laptop HP jack */
> 		present = snd_hda_codec_read(codec, 0x14, 0,
>-				    	 AC_VERB_GET_PIN_SENSE, 0);
>-		spec->jack_present = (present & 0x80000000) != 0;
>+					     AC_VERB_GET_PIN_SENSE, 0);
>+		/* need to execute and sync at first */
>+		snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0);
>+		/* check docking HP jack */
>+		present |= snd_hda_codec_read(codec, 0x1b, 0,
>+					      AC_VERB_GET_PIN_SENSE, 0);
>+		if (present & AC_PINSENSE_PRESENCE)
>+			spec->jack_present = 1;
>+		else
>+			spec->jack_present = 0;
> 		spec->sense_updated = 1;
> 	}
>-	if (spec->jack_present) {
>-		/* mute internal speaker */
>-		snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
>-					 0x80, 0x80);
>-		snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
>-					 0x80, 0x80);
>-	} else {
>-		/* unmute internal speaker if necessary */
>+	/* unmute internal speaker only if both HPs are unplugged and
>+	 * master switch is on
>+	 */
>+	if (spec->jack_present)
>+		mute = HDA_AMP_MUTE;
>+	else
> 		mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);
>-		snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
>-					 0x80, mute & 0x80);
>-		mute = snd_hda_codec_amp_read(codec, 0x14, 1, HDA_OUTPUT, 0);
>-		snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
>-					 0x80, mute & 0x80);
>-	}
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, mute);
> }
> 
> /* unsolicited event for HP jack sensing */
>@@ -6393,75 +9001,60 @@ static void alc262_fujitsu_unsol_event(struct hda_codec *codec,
> 	alc262_fujitsu_automute(codec, 1);
> }
> 
>-/* bind volumes of both NID 0x0c and 0x0d */
>-static int alc262_fujitsu_master_vol_put(struct snd_kcontrol *kcontrol,
>-					 struct snd_ctl_elem_value *ucontrol)
>+static void alc262_fujitsu_init_hook(struct hda_codec *codec)
> {
>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>-	long *valp = ucontrol->value.integer.value;
>-	int change;
>-
>-	change = snd_hda_codec_amp_update(codec, 0x0c, 0, HDA_OUTPUT, 0,
>-					  0x7f, valp[0] & 0x7f);
>-	change |= snd_hda_codec_amp_update(codec, 0x0c, 1, HDA_OUTPUT, 0,
>-					   0x7f, valp[1] & 0x7f);
>-	snd_hda_codec_amp_update(codec, 0x0d, 0, HDA_OUTPUT, 0,
>-				 0x7f, valp[0] & 0x7f);
>-	snd_hda_codec_amp_update(codec, 0x0d, 1, HDA_OUTPUT, 0,
>-				 0x7f, valp[1] & 0x7f);
>-	return change;
>+	alc262_fujitsu_automute(codec, 1);
> }
> 
>-static struct hda_bind_ctls alc262_hp_rp5700_bind_front_vol = {
>+/* bind volumes of both NID 0x0c and 0x0d */
>+static struct hda_bind_ctls alc262_fujitsu_bind_master_vol = {
> 	.ops = &snd_hda_bind_vol,
> 	.values = {
> 		HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT),
>-		HDA_COMPOSE_AMP_VAL(0x0e, 3, 0, HDA_OUTPUT),
>+		HDA_COMPOSE_AMP_VAL(0x0d, 3, 0, HDA_OUTPUT),
> 		0
> 	},
> };
> 
>-static struct hda_bind_ctls alc262_hp_rp5700_bind_front_sw = {
>-	.ops = &snd_hda_bind_sw,
>-	.values = {
>-		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
>-		HDA_COMPOSE_AMP_VAL(0x16, 3, 0, HDA_OUTPUT),
>-		0
>-	},
>-};
>-
>-static struct snd_kcontrol_new alc262_hp_rp5700_mixer[] = {
>-	HDA_BIND_VOL("PCM Playback Volume", &alc262_hp_rp5700_bind_front_vol),
>-	HDA_BIND_SW("PCM Playback Switch", &alc262_hp_rp5700_bind_front_sw),
>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_MUTE("Master Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_VOLUME("iSpeaker Playback Volume", 0x0e, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_MUTE("iSpeaker Playback Switch", 0x16, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),
>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),
>-	{ } /* end */
>-};
>+/* mute/unmute internal speaker according to the hp jack and mute state */
>+static void alc262_lenovo_3000_automute(struct hda_codec *codec, int force)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	unsigned int mute;
> 
>-static struct hda_verb alc262_hp_rp5700_verbs[] = {
>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x00 << 8))},
>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x00 << 8))},
>-	{}
>-};
>+	if (force || !spec->sense_updated) {
>+		unsigned int present_int_hp;
>+		/* need to execute and sync at first */
>+		snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0);
>+		present_int_hp = snd_hda_codec_read(codec, 0x1b, 0,
>+					AC_VERB_GET_PIN_SENSE, 0);
>+		spec->jack_present = (present_int_hp & 0x80000000) != 0;
>+		spec->sense_updated = 1;
>+	}
>+	if (spec->jack_present) {
>+		/* mute internal speaker */
>+		snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, HDA_AMP_MUTE);
>+		snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, HDA_AMP_MUTE);
>+	} else {
>+		/* unmute internal speaker if necessary */
>+		mute = snd_hda_codec_amp_read(codec, 0x1b, 0, HDA_OUTPUT, 0);
>+		snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, mute);
>+		snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, mute);
>+	}
>+}
> 
>-static struct hda_input_mux alc262_hp_rp5700_capture_source = {
>-	.num_items = 1,
>-	.items = {
>-		{ "Line", 0x1 },
>-	},
>-};
>+/* unsolicited event for HP jack sensing */
>+static void alc262_lenovo_3000_unsol_event(struct hda_codec *codec,
>+				       unsigned int res)
>+{
>+	if ((res >> 26) != ALC_HP_EVENT)
>+		return;
>+	alc262_lenovo_3000_automute(codec, 1);
>+}
> 
> /* bind hp and internal speaker mute (with plug check) */
> static int alc262_fujitsu_master_sw_put(struct snd_kcontrol *kcontrol,
>@@ -6471,38 +9064,76 @@ static int alc262_fujitsu_master_sw_put(struct snd_kcontrol *kcontrol,
> 	long *valp = ucontrol->value.integer.value;
> 	int change;
> 
>-	change = snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
>-					  0x80, valp[0] ? 0 : 0x80);
>-	change |= snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
>-					   0x80, valp[1] ? 0 : 0x80);
>-	if (change || codec->in_resume)
>-		alc262_fujitsu_automute(codec, codec->in_resume);
>+	change = snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+						 HDA_AMP_MUTE,
>+						 valp ? 0 : HDA_AMP_MUTE);
>+	change |= snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
>+						 HDA_AMP_MUTE,
>+						 valp ? 0 : HDA_AMP_MUTE);
>+
>+	if (change)
>+		alc262_fujitsu_automute(codec, 0);
> 	return change;
> }
> 
> static struct snd_kcontrol_new alc262_fujitsu_mixer[] = {
>+	HDA_BIND_VOL("Master Playback Volume", &alc262_fujitsu_bind_master_vol),
> 	{
> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Master Playback Volume",
>-		.info = snd_hda_mixer_amp_volume_info,
>-		.get = snd_hda_mixer_amp_volume_get,
>-		.put = alc262_fujitsu_master_vol_put,
>-		.tlv = { .c = snd_hda_mixer_amp_tlv },
>-		.private_value = HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT),
>+		.name = "Master Playback Switch",
>+		.info = snd_hda_mixer_amp_switch_info,
>+		.get = snd_hda_mixer_amp_switch_get,
>+		.put = alc262_fujitsu_master_sw_put,
>+		.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, 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("PC Speaker Volume", 0x0b, 0x05, HDA_INPUT),
>+	HDA_CODEC_MUTE("PC Speaker Switch", 0x0b, 0x05, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, 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("Int Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+/* bind hp and internal speaker mute (with plug check) */
>+static int alc262_lenovo_3000_master_sw_put(struct snd_kcontrol *kcontrol,
>+					 struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>+	long *valp = ucontrol->value.integer.value;
>+	int change;
>+
>+	change = snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
>+						 HDA_AMP_MUTE,
>+						 valp ? 0 : HDA_AMP_MUTE);
>+
>+	if (change)
>+		alc262_lenovo_3000_automute(codec, 0);
>+	return change;
>+}
>+
>+static struct snd_kcontrol_new alc262_lenovo_3000_mixer[] = {
>+	HDA_BIND_VOL("Master Playback Volume", &alc262_fujitsu_bind_master_vol),
> 	{
> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
> 		.name = "Master Playback Switch",
> 		.info = snd_hda_mixer_amp_switch_info,
> 		.get = snd_hda_mixer_amp_switch_get,
>-		.put = alc262_fujitsu_master_sw_put,
>-		.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
>+		.put = alc262_lenovo_3000_master_sw_put,
>+		.private_value = HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, 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 Boost", 0x18, 0, 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("Int Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
> 	{ } /* end */
> };
> 
>@@ -6513,8 +9144,136 @@ static struct hda_verb alc262_EAPD_verbs[] = {
> 	{}
> };
> 
>+static struct hda_verb alc262_benq_t31_EAPD_verbs[] = {
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
>+
>+	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},
>+	{0x20, AC_VERB_SET_PROC_COEF,  0x3050},
>+	{}
>+};
>+
>+/* Samsung Q1 Ultra Vista model setup */
>+static struct snd_kcontrol_new alc262_ultra_mixer[] = {
>+	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Headphone Mic Boost", 0x15, 0, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc262_ultra_verbs[] = {
>+	/* output mixer */
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	/* speaker */
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	/* HP */
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	/* internal mic */
>+	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	/* ADC, choose mic */
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(8)},
>+	{}
>+};
>+
>+/* mute/unmute internal speaker according to the hp jack and mute state */
>+static void alc262_ultra_automute(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	unsigned int mute;
>+
>+	mute = 0;
>+	/* auto-mute only when HP is used as HP */
>+	if (!spec->cur_mux[0]) {
>+		unsigned int present;
>+		/* need to execute and sync at first */
>+		snd_hda_codec_read(codec, 0x15, 0, AC_VERB_SET_PIN_SENSE, 0);
>+		present = snd_hda_codec_read(codec, 0x15, 0,
>+					     AC_VERB_GET_PIN_SENSE, 0);
>+		spec->jack_present = (present & AC_PINSENSE_PRESENCE) != 0;
>+		if (spec->jack_present)
>+			mute = HDA_AMP_MUTE;
>+	}
>+	/* mute/unmute internal speaker */
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, mute);
>+	/* mute/unmute HP */
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, mute ? 0 : HDA_AMP_MUTE);
>+}
>+
>+/* unsolicited event for HP jack sensing */
>+static void alc262_ultra_unsol_event(struct hda_codec *codec,
>+				       unsigned int res)
>+{
>+	if ((res >> 26) != ALC880_HP_EVENT)
>+		return;
>+	alc262_ultra_automute(codec);
>+}
>+
>+static struct hda_input_mux alc262_ultra_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "Mic", 0x1 },
>+		{ "Headphone", 0x7 },
>+	},
>+};
>+
>+static int alc262_ultra_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;
>+	int ret;
>+
>+	ret = alc882_mux_enum_put(kcontrol, ucontrol);
>+	if (!ret)
>+		return 0;
>+	/* reprogram the HP pin as mic or HP according to the input source */
>+	snd_hda_codec_write_cache(codec, 0x15, 0,
>+				  AC_VERB_SET_PIN_WIDGET_CONTROL,
>+				  spec->cur_mux[0] ? PIN_VREF80 : PIN_HP);
>+	alc262_ultra_automute(codec); /* mute/unmute HP */
>+	return ret;
>+}
>+
>+static struct snd_kcontrol_new alc262_ultra_capture_mixer[] = {
>+	HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Capture Source",
>+		.info = alc882_mux_enum_info,
>+		.get = alc882_mux_enum_get,
>+		.put = alc262_ultra_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
> /* 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)
>+static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec,
>+					     const struct auto_pin_cfg *cfg)
> {
> 	hda_nid_t nid;
> 	int err;
>@@ -6525,26 +9284,39 @@ static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec, const struct
> 
> 	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)
>+		err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+				  "Front Playback Volume",
>+				  HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT));
>+		if (err < 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)
>+		err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+				  "Front Playback Switch",
>+				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));
>+		if (err < 0)
> 			return err;
> 	}
> 
> 	nid = cfg->speaker_pins[0];
> 	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)
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+					  "Speaker Playback Volume",
>+					  HDA_COMPOSE_AMP_VAL(0x0e, 2, 0,
>+							      HDA_OUTPUT));
>+			if (err < 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)
>+			err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+					  "Speaker Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 2, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
> 				return err;
> 		} else {
>-			if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Speaker Playback Switch",
>-					       HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
>+			err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+					  "Speaker Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
> 				return err;
> 		}
> 	}
>@@ -6552,23 +9324,33 @@ static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec, const struct
> 	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)
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+					  "Headphone Playback Volume",
>+					  HDA_COMPOSE_AMP_VAL(0x0e, 2, 0,
>+							      HDA_OUTPUT));
>+			if (err < 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)
>+			err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+					  "Headphone Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 2, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
> 				return err;
> 		} else {
>-			if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
>-					       HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
>+			err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+					  "Headphone Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
> 				return err;
> 		}
> 	}
>-	return 0;	
>+	return 0;
> }
> 
> /* identical with ALC880 */
>-#define alc262_auto_create_analog_input_ctls alc880_auto_create_analog_input_ctls
>+#define alc262_auto_create_analog_input_ctls \
>+	alc880_auto_create_analog_input_ctls
> 
> /*
>  * generic initialization of ADC, input mixers and output mixers
>@@ -6584,17 +9366,17 @@ static struct hda_verb alc262_volume_init_verbs[] = {
> 	{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
>+	/* Mute 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)
>+	 * 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)},
>+	{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)},
> 
> 	/*
> 	 * Set up output mixers (0x0c - 0x0f)
>@@ -6645,19 +9427,19 @@ static struct hda_verb alc262_HP_BPC_init_verbs[] = {
> 	{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
>+	/* Mute 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)
>+	 * 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)},
>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},
>-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(6)},
>+	{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)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
>+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
> 	
> 	/*
> 	 * Set up output mixers (0x0c - 0x0e)
>@@ -6676,7 +9458,7 @@ static struct hda_verb alc262_HP_BPC_init_verbs[] = {
> 	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
> 	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
> 
>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
>+	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
> 	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
> 	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
> 
>@@ -6718,6 +9500,8 @@ static struct hda_verb alc262_HP_BPC_init_verbs[] = {
> 	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
> 	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
> 
>+	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+
> 	{ }
> };
> 
>@@ -6732,20 +9516,20 @@ static struct hda_verb alc262_HP_BPC_WildWest_init_verbs[] = {
> 	{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
>+	/* Mute 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)},
>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},
>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(6)},
>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(7)},
>+	{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)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
> 	/*
> 	 * Set up output mixers (0x0c - 0x0e)
> 	 */
>@@ -6812,9 +9596,15 @@ static struct hda_verb alc262_HP_BPC_WildWest_init_verbs[] = {
>         /* {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x06 << 8))}, */
> 	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x07 << 8))},
> 
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+
> 	{ }
> };
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+#define alc262_loopbacks	alc880_loopbacks
>+#endif
>+
> /* pcm configuration: identiacal with ALC880 */
> #define alc262_pcm_analog_playback	alc880_pcm_analog_playback
> #define alc262_pcm_analog_capture	alc880_pcm_analog_capture
>@@ -6830,13 +9620,17 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
> 	int err;
> 	static hda_nid_t alc262_ignore[] = { 0x1d, 0 };
> 
>-	if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>-						alc262_ignore)) < 0)
>+	err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>+					   alc262_ignore);
>+	if (err < 0)
> 		return err;
>-	if (! spec->autocfg.line_outs)
>+	if (!spec->autocfg.line_outs)
> 		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)
>+	err = alc262_auto_create_multi_out_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc262_auto_create_analog_input_ctls(spec, &spec->autocfg);
>+	if (err < 0)
> 		return err;
> 
> 	spec->multiout.max_channels = spec->multiout.num_dacs * 2;
>@@ -6853,6 +9647,10 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
> 	spec->num_mux_defs = 1;
> 	spec->input_mux = &spec->private_imux;
> 
>+	err = alc_auto_add_mic_boost(codec);
>+	if (err < 0)
>+		return err;
>+
> 	return 1;
> }
> 
>@@ -6864,9 +9662,12 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
> /* init callback for auto-configuration model -- overriding the default init */
> static void alc262_auto_init(struct hda_codec *codec)
> {
>+	struct alc_spec *spec = codec->spec;
> 	alc262_auto_init_multi_out(codec);
> 	alc262_auto_init_hp_out(codec);
> 	alc262_auto_init_analog_input(codec);
>+	if (spec->unsol_event)
>+		alc_sku_automute(codec);
> }
> 
> /*
>@@ -6879,33 +9680,53 @@ static const char *alc262_models[ALC262_MODEL_LAST] = {
> 	[ALC262_FUJITSU]	= "fujitsu",
> 	[ALC262_HP_BPC]		= "hp-bpc",
> 	[ALC262_HP_BPC_D7000_WL]= "hp-bpc-d7000",
>+	[ALC262_HP_TC_T5735]	= "hp-tc-t5735",
> 	[ALC262_HP_RP5700]	= "hp-rp5700",
> 	[ALC262_BENQ_ED8]	= "benq",
>+	[ALC262_BENQ_T31]	= "benq-t31",
>+	[ALC262_SONY_ASSAMD]	= "sony-assamd",
>+	[ALC262_ULTRA]		= "ultra",
>+	[ALC262_LENOVO_3000]	= "lenovo-3000",
> 	[ALC262_AUTO]		= "auto",
> };
> 
> static struct snd_pci_quirk alc262_cfg_tbl[] = {
> 	SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),
> 	SND_PCI_QUIRK(0x103c, 0x12fe, "HP xw9400", ALC262_HP_BPC),
>-	SND_PCI_QUIRK(0x103c, 0x280c, "HP xw4400", ALC262_HP_BPC),
>-	SND_PCI_QUIRK(0x103c, 0x3014, "HP xw6400", ALC262_HP_BPC),
>-	SND_PCI_QUIRK(0x103c, 0x3015, "HP xw8400", ALC262_HP_BPC),
>-	SND_PCI_QUIRK(0x103c, 0x1308, "HP xw4600", ALC262_HP_BPC),
>-	SND_PCI_QUIRK(0x103c, 0x1307, "HP xw6600", ALC262_HP_BPC),
>+	SND_PCI_QUIRK(0x103c, 0x12ff, "HP xw4550", ALC262_HP_BPC),
> 	SND_PCI_QUIRK(0x103c, 0x1306, "HP xw8600", ALC262_HP_BPC),
>+	SND_PCI_QUIRK(0x103c, 0x1307, "HP xw6600", ALC262_HP_BPC),
>+	SND_PCI_QUIRK(0x103c, 0x1308, "HP xw4600", ALC262_HP_BPC),
>+	SND_PCI_QUIRK(0x103c, 0x1309, "HP xw4*00", ALC262_HP_BPC),
>+	SND_PCI_QUIRK(0x103c, 0x130a, "HP xw6*00", ALC262_HP_BPC),
>+	SND_PCI_QUIRK(0x103c, 0x130b, "HP xw8*00", ALC262_HP_BPC),
> 	SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),
>-	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),
>-	SND_PCI_QUIRK(0x103c, 0x2804, "HP D7000", ALC262_HP_BPC_D7000_WL),
>-	SND_PCI_QUIRK(0x103c, 0x2806, "HP D7000", ALC262_HP_BPC_D7000_WL),
> 	SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),
>+	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),
> 	SND_PCI_QUIRK(0x103c, 0x2803, "HP D7000", ALC262_HP_BPC_D7000_WF),
>+	SND_PCI_QUIRK(0x103c, 0x2804, "HP D7000", ALC262_HP_BPC_D7000_WL),
> 	SND_PCI_QUIRK(0x103c, 0x2805, "HP D7000", ALC262_HP_BPC_D7000_WF),
>+	SND_PCI_QUIRK(0x103c, 0x2806, "HP D7000", ALC262_HP_BPC_D7000_WL),
> 	SND_PCI_QUIRK(0x103c, 0x2807, "HP D7000", ALC262_HP_BPC_D7000_WF),
>+	SND_PCI_QUIRK(0x103c, 0x280c, "HP xw4400", ALC262_HP_BPC),
>+	SND_PCI_QUIRK(0x103c, 0x3014, "HP xw6400", ALC262_HP_BPC),
>+	SND_PCI_QUIRK(0x103c, 0x3015, "HP xw8400", ALC262_HP_BPC),
>+	SND_PCI_QUIRK(0x103c, 0x302f, "HP Thin Client T5735",
>+		      ALC262_HP_TC_T5735),
> 	SND_PCI_QUIRK(0x103c, 0x2817, "HP RP5700", ALC262_HP_RP5700),
>+	SND_PCI_QUIRK(0x104d, 0x1f00, "Sony ASSAMD", ALC262_SONY_ASSAMD),
> 	SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO),
>+	SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),
>+	SND_PCI_QUIRK(0x104d, 0x900e, "Sony ASSAMD", ALC262_SONY_ASSAMD),
>+	SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD),
> 	SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU),
>-	SND_PCI_QUIRK(0x17ff, 0x058f, "Benq Hippo", ALC262_HIPPO_1),
>+	SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),
>+	SND_PCI_QUIRK(0x144d, 0xc032, "Samsung Q1 Ultra", ALC262_ULTRA),
>+	SND_PCI_QUIRK(0x144d, 0xc039, "Samsung Q1U EL", ALC262_ULTRA),
>+	SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 y410", ALC262_LENOVO_3000),
> 	SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8),
>+	SND_PCI_QUIRK(0x17ff, 0x058d, "Benq T31-16", ALC262_BENQ_T31),
>+	SND_PCI_QUIRK(0x17ff, 0x058f, "Benq Hippo", ALC262_HIPPO_1),
> 	{}
> };
> 
>@@ -6931,6 +9752,7 @@ static struct alc_config_preset alc262_presets[] = {
> 		.channel_mode = alc262_modes,
> 		.input_mux = &alc262_capture_source,
> 		.unsol_event = alc262_hippo_unsol_event,
>+		.init_hook = alc262_hippo_automute,
> 	},
> 	[ALC262_HIPPO_1] = {
> 		.mixers = { alc262_hippo1_mixer },
>@@ -6943,10 +9765,12 @@ static struct alc_config_preset alc262_presets[] = {
> 		.channel_mode = alc262_modes,
> 		.input_mux = &alc262_capture_source,
> 		.unsol_event = alc262_hippo1_unsol_event,
>+		.init_hook = alc262_hippo1_automute,
> 	},
> 	[ALC262_FUJITSU] = {
> 		.mixers = { alc262_fujitsu_mixer },
>-		.init_verbs = { alc262_init_verbs, alc262_fujitsu_unsol_verbs },
>+		.init_verbs = { alc262_init_verbs, alc262_EAPD_verbs,
>+				alc262_fujitsu_unsol_verbs },
> 		.num_dacs = ARRAY_SIZE(alc262_dac_nids),
> 		.dac_nids = alc262_dac_nids,
> 		.hp_nid = 0x03,
>@@ -6955,6 +9779,7 @@ static struct alc_config_preset alc262_presets[] = {
> 		.channel_mode = alc262_modes,
> 		.input_mux = &alc262_fujitsu_capture_source,
> 		.unsol_event = alc262_fujitsu_unsol_event,
>+		.init_hook = alc262_fujitsu_init_hook,
> 	},
> 	[ALC262_HP_BPC] = {
> 		.mixers = { alc262_HP_BPC_mixer },
>@@ -6965,7 +9790,9 @@ static struct alc_config_preset alc262_presets[] = {
> 		.num_channel_mode = ARRAY_SIZE(alc262_modes),
> 		.channel_mode = alc262_modes,
> 		.input_mux = &alc262_HP_capture_source,
>-	},	
>+		.unsol_event = alc262_hp_bpc_unsol_event,
>+		.init_hook = alc262_hp_bpc_automute,
>+	},
> 	[ALC262_HP_BPC_D7000_WF] = {
> 		.mixers = { alc262_HP_BPC_WildWest_mixer },
> 		.init_verbs = { alc262_HP_BPC_WildWest_init_verbs },
>@@ -6974,8 +9801,10 @@ static struct alc_config_preset alc262_presets[] = {
> 		.hp_nid = 0x03,
> 		.num_channel_mode = ARRAY_SIZE(alc262_modes),
> 		.channel_mode = alc262_modes,
>-		.input_mux = &alc262_HP_capture_source,
>-	},	
>+		.input_mux = &alc262_HP_D7000_capture_source,
>+		.unsol_event = alc262_hp_wildwest_unsol_event,
>+		.init_hook = alc262_hp_wildwest_automute,
>+	},
> 	[ALC262_HP_BPC_D7000_WL] = {
> 		.mixers = { alc262_HP_BPC_WildWest_mixer,
> 			    alc262_HP_BPC_WildWest_option_mixer },
>@@ -6985,7 +9814,21 @@ static struct alc_config_preset alc262_presets[] = {
> 		.hp_nid = 0x03,
> 		.num_channel_mode = ARRAY_SIZE(alc262_modes),
> 		.channel_mode = alc262_modes,
>-		.input_mux = &alc262_HP_capture_source,
>+		.input_mux = &alc262_HP_D7000_capture_source,
>+		.unsol_event = alc262_hp_wildwest_unsol_event,
>+		.init_hook = alc262_hp_wildwest_automute,
>+	},
>+	[ALC262_HP_TC_T5735] = {
>+		.mixers = { alc262_hp_t5735_mixer },
>+		.init_verbs = { alc262_init_verbs, alc262_hp_t5735_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,
>+		.unsol_event = alc262_hp_t5735_unsol_event,
>+		.init_hook = alc262_hp_t5735_init_hook,
> 	},
> 	[ALC262_HP_RP5700] = {
> 		.mixers = { alc262_hp_rp5700_mixer },
>@@ -6995,7 +9838,7 @@ static struct alc_config_preset alc262_presets[] = {
> 		.num_channel_mode = ARRAY_SIZE(alc262_modes),
> 		.channel_mode = alc262_modes,
> 		.input_mux = &alc262_hp_rp5700_capture_source,
>-	},
>+        },
> 	[ALC262_BENQ_ED8] = {
> 		.mixers = { alc262_base_mixer },
> 		.init_verbs = { alc262_init_verbs, alc262_EAPD_verbs },
>@@ -7005,7 +9848,58 @@ static struct alc_config_preset alc262_presets[] = {
> 		.num_channel_mode = ARRAY_SIZE(alc262_modes),
> 		.channel_mode = alc262_modes,
> 		.input_mux = &alc262_capture_source,
>-	},		
>+	},
>+	[ALC262_SONY_ASSAMD] = {
>+		.mixers = { alc262_sony_mixer },
>+		.init_verbs = { alc262_init_verbs, alc262_sony_unsol_verbs},
>+		.num_dacs = ARRAY_SIZE(alc262_dac_nids),
>+		.dac_nids = alc262_dac_nids,
>+		.hp_nid = 0x02,
>+		.num_channel_mode = ARRAY_SIZE(alc262_modes),
>+		.channel_mode = alc262_modes,
>+		.input_mux = &alc262_capture_source,
>+		.unsol_event = alc262_hippo_unsol_event,
>+		.init_hook = alc262_hippo_automute,
>+	},
>+	[ALC262_BENQ_T31] = {
>+		.mixers = { alc262_benq_t31_mixer },
>+		.init_verbs = { alc262_init_verbs, alc262_benq_t31_EAPD_verbs, alc262_hippo_unsol_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,
>+		.unsol_event = alc262_hippo_unsol_event,
>+		.init_hook = alc262_hippo_automute,
>+	},	
>+	[ALC262_ULTRA] = {
>+		.mixers = { alc262_ultra_mixer, alc262_ultra_capture_mixer },
>+		.init_verbs = { alc262_ultra_verbs },
>+		.num_dacs = ARRAY_SIZE(alc262_dac_nids),
>+		.dac_nids = alc262_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc262_modes),
>+		.channel_mode = alc262_modes,
>+		.input_mux = &alc262_ultra_capture_source,
>+		.adc_nids = alc262_adc_nids, /* ADC0 */
>+		.capsrc_nids = alc262_capsrc_nids,
>+		.num_adc_nids = 1, /* single ADC */
>+		.unsol_event = alc262_ultra_unsol_event,
>+		.init_hook = alc262_ultra_automute,
>+	},
>+	[ALC262_LENOVO_3000] = {
>+		.mixers = { alc262_lenovo_3000_mixer },
>+		.init_verbs = { alc262_init_verbs, alc262_EAPD_verbs,
>+				alc262_lenovo_3000_unsol_verbs },
>+		.num_dacs = ARRAY_SIZE(alc262_dac_nids),
>+		.dac_nids = alc262_dac_nids,
>+		.hp_nid = 0x03,
>+		.dig_out_nid = ALC262_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc262_modes),
>+		.channel_mode = alc262_modes,
>+		.input_mux = &alc262_fujitsu_capture_source,
>+		.unsol_event = alc262_lenovo_3000_unsol_event,
>+	},
> };
> 
> static int patch_alc262(struct hda_codec *codec)
>@@ -7020,7 +9914,9 @@ static int patch_alc262(struct hda_codec *codec)
> 
> 	codec->spec = spec;
> #if 0
>-	/* pshou 07/11/05  set a zero PCM sample to DAC when FIFO is under-run */
>+	/* 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);
>@@ -7030,6 +9926,8 @@ static int patch_alc262(struct hda_codec *codec)
> 	}
> #endif
> 
>+	alc_fix_pll_init(codec, 0x20, 0x0a, 10);
>+
> 	board_config = snd_hda_check_board_config(codec, ALC262_MODEL_LAST,
> 						  alc262_models,
> 						  alc262_cfg_tbl);
>@@ -7046,7 +9944,7 @@ static int patch_alc262(struct hda_codec *codec)
> 		if (err < 0) {
> 			alc_free(codec);
> 			return err;
>-		} else if (! err) {
>+		} else if (!err) {
> 			printk(KERN_INFO
> 			       "hda_codec: Cannot set up configuration "
> 			       "from BIOS.  Using base mode...\n");
>@@ -7065,32 +9963,1335 @@ static int patch_alc262(struct hda_codec *codec)
> 	spec->stream_digital_playback = &alc262_pcm_digital_playback;
> 	spec->stream_digital_capture = &alc262_pcm_digital_capture;
> 
>-	if (! spec->adc_nids && spec->input_mux) {
>+	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 */
>+		/* get type */
>+		wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
> 		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->capsrc_nids = alc262_capsrc_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->capsrc_nids = alc262_capsrc_nids;
> 			spec->mixers[spec->num_mixers] = alc262_capture_mixer;
> 			spec->num_mixers++;
> 		}
> 	}
> 
>+	spec->vmaster_nid = 0x0c;
>+
> 	codec->patch_ops = alc_patch_ops;
> 	if (board_config == ALC262_AUTO)
> 		spec->init_hook = alc262_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	if (!spec->loopback.amplist)
>+		spec->loopback.amplist = alc262_loopbacks;
>+#endif
>+		
>+	return 0;
>+}
>+
>+/*
>+ *  ALC268 channel source setting (2 channel)
>+ */
>+#define ALC268_DIGOUT_NID	ALC880_DIGOUT_NID
>+#define alc268_modes		alc260_modes
>+	
>+static hda_nid_t alc268_dac_nids[2] = {
>+	/* front, hp */
>+	0x02, 0x03
>+};
>+
>+static hda_nid_t alc268_adc_nids[2] = {
>+	/* ADC0-1 */
>+	0x08, 0x07
>+};
>+
>+static hda_nid_t alc268_adc_nids_alt[1] = {
>+	/* ADC0 */
>+	0x08
>+};
>+
>+static hda_nid_t alc268_capsrc_nids[2] = { 0x23, 0x24 };
>+
>+static struct snd_kcontrol_new alc268_base_mixer[] = {
>+	/* output mixer control */
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),
>+	{ }
>+};
>+
>+/* bind Beep switches of both NID 0x0f and 0x10 */
>+static struct hda_bind_ctls alc268_bind_beep_sw = {
>+	.ops = &snd_hda_bind_sw,
>+	.values = {
>+		HDA_COMPOSE_AMP_VAL(0x0f, 3, 1, HDA_INPUT),
>+		HDA_COMPOSE_AMP_VAL(0x10, 3, 1, HDA_INPUT),
>+		0
>+	},
>+};
>+
>+static struct snd_kcontrol_new alc268_beep_mixer[] = {
>+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x1d, 0x0, HDA_INPUT),
>+	HDA_BIND_SW("Beep Playback Switch", &alc268_bind_beep_sw),
>+	{ }
>+};
>+
>+static struct hda_verb alc268_eapd_verbs[] = {
>+	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
>+	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
>+	{ }
>+};
>+
>+/* Toshiba specific */
>+#define alc268_toshiba_automute	alc262_hippo_automute
>+
>+static struct hda_verb alc268_toshiba_verbs[] = {
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	{ } /* end */
>+};
>+
>+/* Acer specific */
>+/* bind volumes of both NID 0x02 and 0x03 */
>+static struct hda_bind_ctls alc268_acer_bind_master_vol = {
>+	.ops = &snd_hda_bind_vol,
>+	.values = {
>+		HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
>+		HDA_COMPOSE_AMP_VAL(0x03, 3, 0, HDA_OUTPUT),
>+		0
>+	},
>+};
>+
>+/* mute/unmute internal speaker according to the hp jack and mute state */
>+static void alc268_acer_automute(struct hda_codec *codec, int force)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	unsigned int mute;
>+
>+	if (force || !spec->sense_updated) {
>+		unsigned int present;
>+		present = snd_hda_codec_read(codec, 0x14, 0,
>+				    	 AC_VERB_GET_PIN_SENSE, 0);
>+		spec->jack_present = (present & 0x80000000) != 0;
>+		spec->sense_updated = 1;
>+	}
>+	if (spec->jack_present)
>+		mute = HDA_AMP_MUTE; /* mute internal speaker */
>+	else /* unmute internal speaker if necessary */
>+		mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, mute);
>+}
>+
>+
>+/* bind hp and internal speaker mute (with plug check) */
>+static int alc268_acer_master_sw_put(struct snd_kcontrol *kcontrol,
>+				     struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>+	long *valp = ucontrol->value.integer.value;
>+	int change;
>+
>+	change = snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
>+					  HDA_AMP_MUTE,
>+					  valp[0] ? 0 : HDA_AMP_MUTE);
>+	change |= snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
>+					   HDA_AMP_MUTE,
>+					   valp[1] ? 0 : HDA_AMP_MUTE);
>+	if (change)
>+		alc268_acer_automute(codec, 0);
>+	return change;
>+}
>+
>+static struct snd_kcontrol_new alc268_acer_mixer[] = {
>+	/* output mixer control */
>+	HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		.name = "Master Playback Switch",
>+		.info = snd_hda_mixer_amp_switch_info,
>+		.get = snd_hda_mixer_amp_switch_get,
>+		.put = alc268_acer_master_sw_put,
>+		.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
>+	},
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),
>+	{ }
>+};
>+
>+static struct hda_verb alc268_acer_verbs[] = {
>+	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* internal dmic? */
>+	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
>+
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	{ }
>+};
>+
>+/* unsolicited event for HP jack sensing */
>+static void alc268_toshiba_unsol_event(struct hda_codec *codec,
>+				       unsigned int res)
>+{
>+	if ((res >> 26) != ALC880_HP_EVENT)
>+		return;
>+	alc268_toshiba_automute(codec);
>+}
>+
>+static void alc268_acer_unsol_event(struct hda_codec *codec,
>+				       unsigned int res)
>+{
>+	if ((res >> 26) != ALC880_HP_EVENT)
>+		return;
>+	alc268_acer_automute(codec, 1);
>+}
>+
>+static void alc268_acer_init_hook(struct hda_codec *codec)
>+{
>+	alc268_acer_automute(codec, 1);
>+}
>+
>+static struct snd_kcontrol_new alc268_dell_mixer[] = {
>+	/* output mixer control */
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),
>+	{ }
>+};
>+
>+static struct hda_verb alc268_dell_verbs[] = {
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	{ }
>+};
>+
>+/* mute/unmute internal speaker according to the hp jack and mute state */
>+static void alc268_dell_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned int mute;
>+
>+	present = snd_hda_codec_read(codec, 0x15, 0, AC_VERB_GET_PIN_SENSE, 0);
>+	if (present & 0x80000000)
>+		mute = HDA_AMP_MUTE;
>+	else
>+		mute = snd_hda_codec_amp_read(codec, 0x15, 0, HDA_OUTPUT, 0);
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, mute);
>+}
>+
>+static void alc268_dell_unsol_event(struct hda_codec *codec,
>+				    unsigned int res)
>+{
>+	if ((res >> 26) != ALC880_HP_EVENT)
>+		return;
>+	alc268_dell_automute(codec);
>+}
>+
>+#define alc268_dell_init_hook	alc268_dell_automute
>+
>+static struct snd_kcontrol_new alc267_quanta_il1_mixer[] = {
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x2, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Mic Capture Volume", 0x23, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Mic Capture Switch", 0x23, 2, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
>+	{ }
>+};
>+
>+static struct hda_verb alc267_quanta_il1_verbs[] = {
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
>+	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN},
>+	{ }
>+};
>+
>+static void alc267_quanta_il1_hp_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x15, 0, AC_VERB_GET_PIN_SENSE, 0)
>+		& AC_PINSENSE_PRESENCE;
>+	snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
>+			    present ? 0 : PIN_OUT);
>+}
>+
>+static void alc267_quanta_il1_mic_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x18, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_write(codec, 0x23, 0,
>+			    AC_VERB_SET_CONNECT_SEL,
>+			    present ? 0x00 : 0x01);
>+}
>+
>+static void alc267_quanta_il1_automute(struct hda_codec *codec)
>+{
>+	alc267_quanta_il1_hp_automute(codec);
>+	alc267_quanta_il1_mic_automute(codec);
>+}
>+
>+static void alc267_quanta_il1_unsol_event(struct hda_codec *codec,
>+					   unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case ALC880_HP_EVENT:
>+		alc267_quanta_il1_hp_automute(codec);
>+		break;
>+	case ALC880_MIC_EVENT:
>+		alc267_quanta_il1_mic_automute(codec);
>+		break;
>+	}
>+}
>+
>+/*
>+ * generic initialization of ADC, input mixers and output mixers
>+ */
>+static struct hda_verb alc268_base_init_verbs[] = {
>+	/* Unmute DAC0-1 and set vol = 0 */
>+	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+
>+	/*
>+	 * Set up output mixers (0x0c - 0x0e)
>+	 */
>+	/* set vol=0 to output mixers */
>+	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+        {0x0e, AC_VERB_SET_CONNECT_SEL, 0x00},
>+
>+	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+
>+	{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},
>+	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
>+	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
>+	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
>+	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
>+
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{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},
>+	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+
>+	/* set PCBEEP vol = 0, mute connections */
>+	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+
>+	/* Unmute Selector 23h,24h and set the default input to mic-in */
>+	
>+	{0x23, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{0x24, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+
>+	{ }
>+};
>+
>+/*
>+ * generic initialization of ADC, input mixers and output mixers
>+ */
>+static struct hda_verb alc268_volume_init_verbs[] = {
>+	/* set output DAC */
>+	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+
>+	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
>+	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
>+	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
>+	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
>+	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
>+
>+	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{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)},
>+	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+
>+	{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},
>+	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+
>+	/* set PCBEEP vol = 0, mute connections */
>+	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
>+
>+	{ }
>+};
>+
>+#define alc268_mux_enum_info alc_mux_enum_info
>+#define alc268_mux_enum_get alc_mux_enum_get
>+#define alc268_mux_enum_put alc_mux_enum_put
>+
>+static struct snd_kcontrol_new alc268_capture_alt_mixer[] = {
>+	HDA_CODEC_VOLUME("Capture Volume", 0x23, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Capture Switch", 0x23, 0x0, HDA_OUTPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		/* The multiple "Capture Source" controls confuse alsamixer
>+		 * So call somewhat different..
>+		 */
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 1,
>+		.info = alc268_mux_enum_info,
>+		.get = alc268_mux_enum_get,
>+		.put = alc268_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc268_capture_mixer[] = {
>+	HDA_CODEC_VOLUME("Capture Volume", 0x23, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Capture Switch", 0x23, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x24, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x24, 0x0, HDA_OUTPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		/* The multiple "Capture Source" controls confuse alsamixer
>+		 * So call somewhat different..
>+		 */
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 2,
>+		.info = alc268_mux_enum_info,
>+		.get = alc268_mux_enum_get,
>+		.put = alc268_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
>+static struct hda_input_mux alc268_capture_source = {
>+	.num_items = 4,
>+	.items = {
>+		{ "Mic", 0x0 },
>+		{ "Front Mic", 0x1 },
>+		{ "Line", 0x2 },
>+		{ "CD", 0x3 },
>+	},
>+};
>+
>+static struct hda_input_mux alc268_acer_capture_source = {
>+	.num_items = 3,
>+	.items = {
>+		{ "Mic", 0x0 },
>+		{ "Internal Mic", 0x6 },
>+		{ "Line", 0x2 },
>+	},
>+};
>+
>+#ifdef CONFIG_SND_DEBUG
>+static struct snd_kcontrol_new alc268_test_mixer[] = {
>+	/* Volume widgets */
>+	HDA_CODEC_VOLUME("LOUT1 Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("LOUT2 Playback Volume", 0x03, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE_MONO("Mono sum Playback Switch", 0x0e, 1, 2, HDA_INPUT),
>+	HDA_BIND_MUTE("LINE-OUT sum Playback Switch", 0x0f, 2, HDA_INPUT),
>+	HDA_BIND_MUTE("HP-OUT sum Playback Switch", 0x10, 2, HDA_INPUT),
>+	HDA_BIND_MUTE("LINE-OUT Playback Switch", 0x14, 2, HDA_OUTPUT),
>+	HDA_BIND_MUTE("HP-OUT Playback Switch", 0x15, 2, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Mono Playback Switch", 0x16, 2, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("MIC1 Capture Volume", 0x18, 0x0, HDA_INPUT),
>+	HDA_BIND_MUTE("MIC1 Capture Switch", 0x18, 2, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("MIC2 Capture Volume", 0x19, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("LINE1 Capture Volume", 0x1a, 0x0, HDA_INPUT),
>+	HDA_BIND_MUTE("LINE1 Capture Switch", 0x1a, 2, HDA_OUTPUT),
>+	/* The below appears problematic on some hardwares */
>+	/*HDA_CODEC_VOLUME("PCBEEP Playback Volume", 0x1d, 0x0, HDA_INPUT),*/
>+	HDA_CODEC_VOLUME("PCM-IN1 Capture Volume", 0x23, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("PCM-IN1 Capture Switch", 0x23, 2, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("PCM-IN2 Capture Volume", 0x24, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("PCM-IN2 Capture Switch", 0x24, 2, HDA_OUTPUT),
>+
>+	/* Modes for retasking pin widgets */
>+	ALC_PIN_MODE("LINE-OUT pin mode", 0x14, ALC_PIN_DIR_INOUT),
>+	ALC_PIN_MODE("HP-OUT pin mode", 0x15, ALC_PIN_DIR_INOUT),
>+	ALC_PIN_MODE("MIC1 pin mode", 0x18, ALC_PIN_DIR_INOUT),
>+	ALC_PIN_MODE("LINE1 pin mode", 0x1a, ALC_PIN_DIR_INOUT),
>+
>+	/* Controls for GPIO pins, assuming they are configured as outputs */
>+	ALC_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01),
>+	ALC_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02),
>+	ALC_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04),
>+	ALC_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08),
>+
>+	/* Switches to allow the digital SPDIF output pin to be enabled.
>+	 * The ALC268 does not have an SPDIF input.
>+	 */
>+	ALC_SPDIF_CTRL_SWITCH("SPDIF Playback Switch", 0x06, 0x01),
>+
>+	/* A switch allowing EAPD to be enabled.  Some laptops seem to use
>+	 * this output to turn on an external amplifier.
>+	 */
>+	ALC_EAPD_CTRL_SWITCH("LINE-OUT EAPD Enable Switch", 0x0f, 0x02),
>+	ALC_EAPD_CTRL_SWITCH("HP-OUT EAPD Enable Switch", 0x10, 0x02),
>+
>+	{ } /* end */
>+};
>+#endif
>+
>+/* create input playback/capture controls for the given pin */
>+static int alc268_new_analog_output(struct alc_spec *spec, hda_nid_t nid,
>+				    const char *ctlname, int idx)
>+{
>+	char name[32];
>+	int err;
>+
>+	sprintf(name, "%s Playback Volume", ctlname);
>+	if (nid == 0x14) {
>+		err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
>+				  HDA_COMPOSE_AMP_VAL(0x02, 3, idx,
>+						      HDA_OUTPUT));
>+		if (err < 0)
>+			return err;
>+	} else if (nid == 0x15) {
>+		err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
>+				  HDA_COMPOSE_AMP_VAL(0x03, 3, idx,
>+						      HDA_OUTPUT));
>+		if (err < 0)
>+			return err;
>+	} else
>+		return -1;
>+	sprintf(name, "%s Playback Switch", ctlname);
>+	err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
>+			  HDA_COMPOSE_AMP_VAL(nid, 3, idx, HDA_OUTPUT));
>+	if (err < 0)
>+		return err;
>+	return 0;
>+}
>+
>+/* add playback controls from the parsed DAC table */
>+static int alc268_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 = 2;	/* only use one dac */
>+	spec->multiout.dac_nids = spec->private_dac_nids;
>+	spec->multiout.dac_nids[0] = 2;
>+	spec->multiout.dac_nids[1] = 3;
>+
>+	nid = cfg->line_out_pins[0];
>+	if (nid)
>+		alc268_new_analog_output(spec, nid, "Front", 0);	
>+
>+	nid = cfg->speaker_pins[0];
>+	if (nid == 0x1d) {
>+		err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+				  "Speaker Playback Volume",
>+				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
>+		if (err < 0)
>+			return err;
>+	}
>+	nid = cfg->hp_pins[0];
>+	if (nid)
>+		alc268_new_analog_output(spec, nid, "Headphone", 0);
>+
>+	nid = cfg->line_out_pins[1] | cfg->line_out_pins[2];
>+	if (nid == 0x16) {
>+		err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+				  "Mono Playback Switch",
>+				  HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_INPUT));
>+		if (err < 0)
>+			return err;
>+	}
>+	return 0;	
>+}
>+
>+/* create playback/capture controls for input pins */
>+static int alc268_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, idx1;
>+
>+	for (i = 0; i < AUTO_PIN_LAST; i++) {
>+		switch(cfg->input_pins[i]) {
>+		case 0x18:
>+			idx1 = 0;	/* Mic 1 */
>+			break;
>+		case 0x19:
>+			idx1 = 1;	/* Mic 2 */
>+			break;
>+		case 0x1a:
>+			idx1 = 2;	/* Line In */
>+			break;
>+		case 0x1c:	
>+			idx1 = 3;	/* CD */
>+			break;
>+		case 0x12:
>+		case 0x13:
>+			idx1 = 6;	/* digital mics */
>+			break;
>+		default:
>+			continue;
>+		}
>+		imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
>+		imux->items[imux->num_items].index = idx1;
>+		imux->num_items++;	
>+	}
>+	return 0;
>+}
>+
>+static void alc268_auto_init_mono_speaker_out(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	hda_nid_t speaker_nid = spec->autocfg.speaker_pins[0];
>+	hda_nid_t hp_nid = spec->autocfg.hp_pins[0];
>+	hda_nid_t line_nid = spec->autocfg.line_out_pins[0];
>+	unsigned int	dac_vol1, dac_vol2;
>+
>+	if (speaker_nid) {
>+		snd_hda_codec_write(codec, speaker_nid, 0,
>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
>+		snd_hda_codec_write(codec, 0x0f, 0,
>+				    AC_VERB_SET_AMP_GAIN_MUTE,
>+				    AMP_IN_UNMUTE(1));
>+		snd_hda_codec_write(codec, 0x10, 0,
>+				    AC_VERB_SET_AMP_GAIN_MUTE,
>+				    AMP_IN_UNMUTE(1));
>+	} else {
>+		snd_hda_codec_write(codec, 0x0f, 0,
>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1));
>+		snd_hda_codec_write(codec, 0x10, 0,
>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1));
>+	}
>+
>+	dac_vol1 = dac_vol2 = 0xb000 | 0x40;	/* set max volume  */
>+	if (line_nid == 0x14)	
>+		dac_vol2 = AMP_OUT_ZERO;
>+	else if (line_nid == 0x15)
>+		dac_vol1 = AMP_OUT_ZERO;
>+	if (hp_nid == 0x14)	
>+		dac_vol2 = AMP_OUT_ZERO;
>+	else if (hp_nid == 0x15)
>+		dac_vol1 = AMP_OUT_ZERO;
>+	if (line_nid != 0x16 || hp_nid != 0x16 ||
>+	    spec->autocfg.line_out_pins[1] != 0x16 ||
>+	    spec->autocfg.line_out_pins[2] != 0x16)
>+		dac_vol1 = dac_vol2 = AMP_OUT_ZERO;
>+
>+	snd_hda_codec_write(codec, 0x02, 0,
>+			    AC_VERB_SET_AMP_GAIN_MUTE, dac_vol1);
>+	snd_hda_codec_write(codec, 0x03, 0,
>+			    AC_VERB_SET_AMP_GAIN_MUTE, dac_vol2);
>+}
>+
>+/* pcm configuration: identiacal with ALC880 */
>+#define alc268_pcm_analog_playback	alc880_pcm_analog_playback
>+#define alc268_pcm_analog_capture	alc880_pcm_analog_capture
>+#define alc268_pcm_analog_alt_capture	alc880_pcm_analog_alt_capture
>+#define alc268_pcm_digital_playback	alc880_pcm_digital_playback
>+
>+/*
>+ * BIOS auto configuration
>+ */
>+static int alc268_parse_auto_config(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	int err;
>+	static hda_nid_t alc268_ignore[] = { 0 };
>+
>+	err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>+					   alc268_ignore);
>+	if (err < 0)
>+		return err;
>+	if (!spec->autocfg.line_outs)
>+		return 0; /* can't find valid BIOS pin config */
>+
>+	err = alc268_auto_create_multi_out_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc268_auto_create_analog_input_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+
>+	spec->multiout.max_channels = 2;
>+
>+	/* digital only support output */
>+	if (spec->autocfg.dig_out_pin)
>+		spec->multiout.dig_out_nid = ALC268_DIGOUT_NID;
>+
>+	if (spec->kctl_alloc)
>+		spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
>+
>+	if (spec->autocfg.speaker_pins[0] != 0x1d)
>+		spec->mixers[spec->num_mixers++] = alc268_beep_mixer;
>+
>+	spec->init_verbs[spec->num_init_verbs++] = alc268_volume_init_verbs;
>+	spec->num_mux_defs = 1;
>+	spec->input_mux = &spec->private_imux;
>+
>+	err = alc_auto_add_mic_boost(codec);
>+	if (err < 0)
>+		return err;
>+
>+	return 1;
>+}
>+
>+#define alc268_auto_init_multi_out	alc882_auto_init_multi_out
>+#define alc268_auto_init_hp_out		alc882_auto_init_hp_out
>+#define alc268_auto_init_analog_input	alc882_auto_init_analog_input
>+
>+/* init callback for auto-configuration model -- overriding the default init */
>+static void alc268_auto_init(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	alc268_auto_init_multi_out(codec);
>+	alc268_auto_init_hp_out(codec);
>+	alc268_auto_init_mono_speaker_out(codec);
>+	alc268_auto_init_analog_input(codec);
>+	if (spec->unsol_event)
>+		alc_sku_automute(codec);
>+}
>+
>+/*
>+ * configuration and preset
>+ */
>+static const char *alc268_models[ALC268_MODEL_LAST] = {
>+	[ALC267_QUANTA_IL1]	= "quanta-il1",
>+	[ALC268_3ST]		= "3stack",
>+	[ALC268_TOSHIBA]	= "toshiba",
>+	[ALC268_ACER]		= "acer",
>+	[ALC268_DELL]		= "dell",
>+	[ALC268_ZEPTO]		= "zepto",
>+#ifdef CONFIG_SND_DEBUG
>+	[ALC268_TEST]		= "test",
>+#endif
>+	[ALC268_AUTO]		= "auto",
>+};
>+
>+static struct snd_pci_quirk alc268_cfg_tbl[] = {
>+	SND_PCI_QUIRK(0x1025, 0x011e, "Acer Aspire 5720z", ALC268_ACER),
>+	SND_PCI_QUIRK(0x1025, 0x0126, "Acer", ALC268_ACER),
>+	SND_PCI_QUIRK(0x1025, 0x012e, "Acer Aspire 5310", ALC268_ACER),
>+	SND_PCI_QUIRK(0x1025, 0x0130, "Acer Extensa 5210", ALC268_ACER),
>+	SND_PCI_QUIRK(0x1025, 0x0136, "Acer Aspire 5315", ALC268_ACER),
>+	SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
>+	SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA),
>+	SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
>+	SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA),
>+	SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA),
>+	SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA),
>+	SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),
>+	SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1),
>+	SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO),
>+	{}
>+};
>+
>+static struct alc_config_preset alc268_presets[] = {
>+	[ALC267_QUANTA_IL1] = {
>+		.mixers = { alc267_quanta_il1_mixer },
>+		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
>+				alc267_quanta_il1_verbs },
>+		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
>+		.dac_nids = alc268_dac_nids,
>+		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
>+		.adc_nids = alc268_adc_nids_alt,
>+		.hp_nid = 0x03,
>+		.num_channel_mode = ARRAY_SIZE(alc268_modes),
>+		.channel_mode = alc268_modes,
>+		.input_mux = &alc268_capture_source,
>+		.unsol_event = alc267_quanta_il1_unsol_event,
>+		.init_hook = alc267_quanta_il1_automute,
>+	},
>+	[ALC268_3ST] = {
>+		.mixers = { alc268_base_mixer, alc268_capture_alt_mixer,
>+			    alc268_beep_mixer },
>+		.init_verbs = { alc268_base_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
>+		.dac_nids = alc268_dac_nids,
>+                .num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
>+                .adc_nids = alc268_adc_nids_alt,
>+		.capsrc_nids = alc268_capsrc_nids,
>+		.hp_nid = 0x03,
>+		.dig_out_nid = ALC268_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc268_modes),
>+		.channel_mode = alc268_modes,
>+		.input_mux = &alc268_capture_source,
>+	},
>+	[ALC268_TOSHIBA] = {
>+		.mixers = { alc268_base_mixer, alc268_capture_alt_mixer,
>+			    alc268_beep_mixer },
>+		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
>+				alc268_toshiba_verbs },
>+		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
>+		.dac_nids = alc268_dac_nids,
>+		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
>+		.adc_nids = alc268_adc_nids_alt,
>+		.capsrc_nids = alc268_capsrc_nids,
>+		.hp_nid = 0x03,
>+		.num_channel_mode = ARRAY_SIZE(alc268_modes),
>+		.channel_mode = alc268_modes,
>+		.input_mux = &alc268_capture_source,
>+		.unsol_event = alc268_toshiba_unsol_event,
>+		.init_hook = alc268_toshiba_automute,
>+	},
>+	[ALC268_ACER] = {
>+		.mixers = { alc268_acer_mixer, alc268_capture_alt_mixer,
>+			    alc268_beep_mixer },
>+		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
>+				alc268_acer_verbs },
>+		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
>+		.dac_nids = alc268_dac_nids,
>+		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
>+		.adc_nids = alc268_adc_nids_alt,
>+		.capsrc_nids = alc268_capsrc_nids,
>+		.hp_nid = 0x02,
>+		.num_channel_mode = ARRAY_SIZE(alc268_modes),
>+		.channel_mode = alc268_modes,
>+		.input_mux = &alc268_acer_capture_source,
>+		.unsol_event = alc268_acer_unsol_event,
>+		.init_hook = alc268_acer_init_hook,
>+	},
>+	[ALC268_DELL] = {
>+		.mixers = { alc268_dell_mixer, alc268_beep_mixer },
>+		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
>+				alc268_dell_verbs },
>+		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
>+		.dac_nids = alc268_dac_nids,
>+		.hp_nid = 0x02,
>+		.num_channel_mode = ARRAY_SIZE(alc268_modes),
>+		.channel_mode = alc268_modes,
>+		.unsol_event = alc268_dell_unsol_event,
>+		.init_hook = alc268_dell_init_hook,
>+		.input_mux = &alc268_capture_source,
>+	},
>+	[ALC268_ZEPTO] = {
>+		.mixers = { alc268_base_mixer, alc268_capture_alt_mixer,
>+			    alc268_beep_mixer },
>+		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
>+				alc268_toshiba_verbs },
>+		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
>+		.dac_nids = alc268_dac_nids,
>+		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
>+		.adc_nids = alc268_adc_nids_alt,
>+		.capsrc_nids = alc268_capsrc_nids,
>+		.hp_nid = 0x03,
>+		.dig_out_nid = ALC268_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc268_modes),
>+		.channel_mode = alc268_modes,
>+		.input_mux = &alc268_capture_source,
>+		.unsol_event = alc268_toshiba_unsol_event,
>+		.init_hook = alc268_toshiba_automute
>+	},
>+#ifdef CONFIG_SND_DEBUG
>+	[ALC268_TEST] = {
>+		.mixers = { alc268_test_mixer, alc268_capture_mixer },
>+		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
>+				alc268_volume_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
>+		.dac_nids = alc268_dac_nids,
>+		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
>+		.adc_nids = alc268_adc_nids_alt,
>+		.capsrc_nids = alc268_capsrc_nids,
>+		.hp_nid = 0x03,
>+		.dig_out_nid = ALC268_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc268_modes),
>+		.channel_mode = alc268_modes,
>+		.input_mux = &alc268_capture_source,
>+	},
>+#endif
>+};
>+
>+static int patch_alc268(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, ALC268_MODEL_LAST,
>+						  alc268_models,
>+						  alc268_cfg_tbl);
>+
>+	if (board_config < 0 || board_config >= ALC268_MODEL_LAST) {
>+		printk(KERN_INFO "hda_codec: Unknown model for ALC268, "
>+		       "trying auto-probe from BIOS...\n");
>+		board_config = ALC268_AUTO;
>+	}
>+
>+	if (board_config == ALC268_AUTO) {
>+		/* automatic parse from the BIOS config */
>+		err = alc268_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 = ALC268_3ST;
>+		}
>+	}
>+
>+	if (board_config != ALC268_AUTO)
>+		setup_preset(spec, &alc268_presets[board_config]);
>+
>+	if (codec->vendor_id == 0x10ec0267) {
>+		spec->stream_name_analog = "ALC267 Analog";
>+		spec->stream_name_digital = "ALC267 Digital";
>+	} else {
>+		spec->stream_name_analog = "ALC268 Analog";
>+		spec->stream_name_digital = "ALC268 Digital";
>+	}
>+
>+	spec->stream_analog_playback = &alc268_pcm_analog_playback;
>+	spec->stream_analog_capture = &alc268_pcm_analog_capture;
>+	spec->stream_analog_alt_capture = &alc268_pcm_analog_alt_capture;
>+
>+	spec->stream_digital_playback = &alc268_pcm_digital_playback;
>+
>+	if (!query_amp_caps(codec, 0x1d, HDA_INPUT))
>+		/* override the amp caps for beep generator */
>+		snd_hda_override_amp_caps(codec, 0x1d, HDA_INPUT,
>+					  (0x0c << AC_AMPCAP_OFFSET_SHIFT) |
>+					  (0x0c << AC_AMPCAP_NUM_STEPS_SHIFT) |
>+					  (0x07 << AC_AMPCAP_STEP_SIZE_SHIFT) |
>+					  (0 << AC_AMPCAP_MUTE_SHIFT));
>+
>+	if (!spec->adc_nids && spec->input_mux) {
>+		/* check whether NID 0x07 is valid */
>+		unsigned int wcap = get_wcaps(codec, 0x07);
>+		int i;
>+
>+		/* get type */
>+		wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
>+		if (wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) {
>+			spec->adc_nids = alc268_adc_nids_alt;
>+			spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt);
>+			spec->mixers[spec->num_mixers] =
>+					alc268_capture_alt_mixer;
>+			spec->num_mixers++;
>+		} else {
>+			spec->adc_nids = alc268_adc_nids;
>+			spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids);
>+			spec->mixers[spec->num_mixers] =
>+				alc268_capture_mixer;
>+			spec->num_mixers++;
>+		}
>+		spec->capsrc_nids = alc268_capsrc_nids;
>+		/* set default input source */
>+		for (i = 0; i < spec->num_adc_nids; i++)
>+			snd_hda_codec_write_cache(codec, alc268_capsrc_nids[i],
>+				0, AC_VERB_SET_CONNECT_SEL,
>+				spec->input_mux->items[0].index);
>+	}
>+
>+	spec->vmaster_nid = 0x02;
>+
>+	codec->patch_ops = alc_patch_ops;
>+	if (board_config == ALC268_AUTO)
>+		spec->init_hook = alc268_auto_init;
> 		
> 	return 0;
> }
> 
> /*
>+ *  ALC269 channel source setting (2 channel)
>+ */
>+#define ALC269_DIGOUT_NID	ALC880_DIGOUT_NID
>+
>+#define alc269_dac_nids		alc260_dac_nids
>+
>+static hda_nid_t alc269_adc_nids[1] = {
>+	/* ADC1 */
>+	0x07,
>+};
>+
>+#define alc269_modes		alc260_modes
>+#define alc269_capture_source	alc880_lg_lw_capture_source
>+
>+static struct snd_kcontrol_new alc269_base_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	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("Mic Boost", 0x18, 0, 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("Front Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
>+	{ } /* end */
>+};
>+
>+/* capture mixer elements */
>+static struct snd_kcontrol_new alc269_capture_mixer[] = {
>+	HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		/* The multiple "Capture Source" controls confuse alsamixer
>+		 * So call somewhat different..
>+		 */
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 1,
>+		.info = alc_mux_enum_info,
>+		.get = alc_mux_enum_get,
>+		.put = alc_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
>+/*
>+ * generic initialization of ADC, input mixers and output mixers
>+ */
>+static struct hda_verb alc269_init_verbs[] = {
>+	/*
>+	 * Unmute ADC0 and set the default input to mic-in
>+	 */
>+	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+
>+	/* Mute input amps (PCBeep, 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_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)},
>+
>+	/*
>+	 * Set up output mixers (0x0c - 0x0e)
>+	 */
>+	/* set vol=0 to output mixers */
>+	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x03, 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, PIN_OUT},
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{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},
>+
>+	{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_MUTE},
>+	{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},
>+
>+	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
>+
>+	/* FIXME: use matrix-type input source selection */
>+	/* Mixer elements: 0x18, 19, 1a, 1b, 1d, 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(1)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
>+	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
>+
>+	/* set EAPD */
>+	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
>+	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
>+	{ }
>+};
>+
>+/* add playback controls from the parsed DAC table */
>+static int alc269_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) {
>+		err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+				  "Front Playback Volume",
>+				  HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT));
>+		if (err < 0)
>+			return err;
>+		err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+				  "Front Playback Switch",
>+				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));
>+		if (err < 0)
>+			return err;
>+	}
>+
>+	nid = cfg->speaker_pins[0];
>+	if (nid) {
>+		if (!cfg->line_out_pins[0]) {
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+					  "Speaker Playback Volume",
>+					  HDA_COMPOSE_AMP_VAL(0x02, 3, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+		}
>+		if (nid == 0x16) {
>+			err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+					  "Speaker Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 2, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+		} else {
>+			err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+					  "Speaker Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+		}
>+	}
>+	nid = cfg->hp_pins[0];
>+	if (nid) {
>+		/* spec->multiout.hp_nid = 2; */
>+		if (!cfg->line_out_pins[0] && !cfg->speaker_pins[0]) {
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+					  "Headphone Playback Volume",
>+					  HDA_COMPOSE_AMP_VAL(0x02, 3, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+		}
>+		if (nid == 0x16) {
>+			err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+					  "Headphone Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 2, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+		} else {
>+			err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+					  "Headphone Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+		}
>+	}
>+	return 0;
>+}
>+
>+#define alc269_auto_create_analog_input_ctls \
>+	alc880_auto_create_analog_input_ctls
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+#define alc269_loopbacks	alc880_loopbacks
>+#endif
>+
>+/* pcm configuration: identiacal with ALC880 */
>+#define alc269_pcm_analog_playback	alc880_pcm_analog_playback
>+#define alc269_pcm_analog_capture	alc880_pcm_analog_capture
>+#define alc269_pcm_digital_playback	alc880_pcm_digital_playback
>+#define alc269_pcm_digital_capture	alc880_pcm_digital_capture
>+
>+/*
>+ * BIOS auto configuration
>+ */
>+static int alc269_parse_auto_config(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	int err;
>+	static hda_nid_t alc269_ignore[] = { 0x1d, 0 };
>+
>+	err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>+					   alc269_ignore);
>+	if (err < 0)
>+		return err;
>+
>+	err = alc269_auto_create_multi_out_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc269_auto_create_analog_input_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+
>+	spec->multiout.max_channels = spec->multiout.num_dacs * 2;
>+
>+	if (spec->autocfg.dig_out_pin)
>+		spec->multiout.dig_out_nid = ALC269_DIGOUT_NID;
>+
>+	if (spec->kctl_alloc)
>+		spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
>+
>+	spec->init_verbs[spec->num_init_verbs++] = alc269_init_verbs;
>+	spec->num_mux_defs = 1;
>+	spec->input_mux = &spec->private_imux;
>+
>+	err = alc_auto_add_mic_boost(codec);
>+	if (err < 0)
>+		return err;
>+
>+	return 1;
>+}
>+
>+#define alc269_auto_init_multi_out	alc882_auto_init_multi_out
>+#define alc269_auto_init_hp_out		alc882_auto_init_hp_out
>+#define alc269_auto_init_analog_input	alc882_auto_init_analog_input
>+
>+
>+/* init callback for auto-configuration model -- overriding the default init */
>+static void alc269_auto_init(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	alc269_auto_init_multi_out(codec);
>+	alc269_auto_init_hp_out(codec);
>+	alc269_auto_init_analog_input(codec);
>+	if (spec->unsol_event)
>+		alc_sku_automute(codec);
>+}
>+
>+/*
>+ * configuration and preset
>+ */
>+static const char *alc269_models[ALC269_MODEL_LAST] = {
>+	[ALC269_BASIC]		= "basic",
>+};
>+
>+static struct snd_pci_quirk alc269_cfg_tbl[] = {
>+	{}
>+};
>+
>+static struct alc_config_preset alc269_presets[] = {
>+	[ALC269_BASIC] = {
>+		.mixers = { alc269_base_mixer },
>+		.init_verbs = { alc269_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc269_dac_nids),
>+		.dac_nids = alc269_dac_nids,
>+		.hp_nid = 0x03,
>+		.num_channel_mode = ARRAY_SIZE(alc269_modes),
>+		.channel_mode = alc269_modes,
>+		.input_mux = &alc269_capture_source,
>+	},
>+};
>+
>+static int patch_alc269(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;
>+
>+	alc_fix_pll_init(codec, 0x20, 0x04, 15);
>+
>+	board_config = snd_hda_check_board_config(codec, ALC269_MODEL_LAST,
>+						  alc269_models,
>+						  alc269_cfg_tbl);
>+
>+	if (board_config < 0) {
>+		printk(KERN_INFO "hda_codec: Unknown model for ALC269, "
>+		       "trying auto-probe from BIOS...\n");
>+		board_config = ALC269_AUTO;
>+	}
>+
>+	if (board_config == ALC269_AUTO) {
>+		/* automatic parse from the BIOS config */
>+		err = alc269_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 = ALC269_BASIC;
>+		}
>+	}
>+
>+	if (board_config != ALC269_AUTO)
>+		setup_preset(spec, &alc269_presets[board_config]);
>+
>+	spec->stream_name_analog = "ALC269 Analog";
>+	spec->stream_analog_playback = &alc269_pcm_analog_playback;
>+	spec->stream_analog_capture = &alc269_pcm_analog_capture;
>+
>+	spec->stream_name_digital = "ALC269 Digital";
>+	spec->stream_digital_playback = &alc269_pcm_digital_playback;
>+	spec->stream_digital_capture = &alc269_pcm_digital_capture;
>+
>+	spec->adc_nids = alc269_adc_nids;
>+	spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids);
>+	spec->mixers[spec->num_mixers] = alc269_capture_mixer;
>+	spec->num_mixers++;
>+
>+	codec->patch_ops = alc_patch_ops;
>+	if (board_config == ALC269_AUTO)
>+		spec->init_hook = alc269_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	if (!spec->loopback.amplist)
>+		spec->loopback.amplist = alc269_loopbacks;
>+#endif
>+
>+	return 0;
>+}
>+
>+/*
>  *  ALC861 channel source setting (2/6 channel selection for 3-stack)
>  */
> 
>@@ -7101,7 +11302,9 @@ static int patch_alc262(struct hda_codec *codec)
> 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 */
>+	/* 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 },
>@@ -7158,7 +11361,9 @@ static struct hda_channel_mode alc861_uniwill_m31_modes[2] = {
> static struct hda_verb alc861_asus_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 */
>+	/* 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 },
>@@ -7213,7 +11418,7 @@ static struct snd_kcontrol_new alc861_base_mixer[] = {
> 	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),
>@@ -7247,7 +11452,7 @@ static struct snd_kcontrol_new alc861_3ST_mixer[] = {
> 	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),
>@@ -7289,7 +11494,7 @@ static struct snd_kcontrol_new alc861_toshiba_mixer[] = {
> 	},
> 
> 	{ } /* end */
>-};	
>+};
> 
> static struct snd_kcontrol_new alc861_uniwill_m31_mixer[] = {
>         /* output mixer control */
>@@ -7310,7 +11515,7 @@ static struct snd_kcontrol_new alc861_uniwill_m31_mixer[] = {
> 	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),
>@@ -7331,7 +11536,7 @@ static struct snd_kcontrol_new alc861_uniwill_m31_mixer[] = {
>                 .private_value = ARRAY_SIZE(alc861_uniwill_m31_modes),
> 	},
> 	{ } /* end */
>-};			
>+};
> 
> static struct snd_kcontrol_new alc861_asus_mixer[] = {
>         /* output mixer control */
>@@ -7351,8 +11556,8 @@ static struct snd_kcontrol_new alc861_asus_mixer[] = {
> 	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_OUTPUT), /* was HDA_INPUT (why?) */
>- 
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_OUTPUT),
>+
> 	/* Capture mixer control */
> 	HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
> 	HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
>@@ -7436,7 +11641,7 @@ static struct hda_verb alc861_base_init_verbs[] = {
> 	{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
>+	{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)},
>@@ -7446,7 +11651,8 @@ static struct hda_verb alc861_base_init_verbs[] = {
> 	{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)
>+	/* hp used DAC 3 (Front) */
>+	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
>         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
> 
> 	{ }
>@@ -7497,7 +11703,7 @@ static struct hda_verb alc861_threestack_init_verbs[] = {
> 	{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
>+	{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)},
>@@ -7507,7 +11713,8 @@ static struct hda_verb alc861_threestack_init_verbs[] = {
> 	{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)
>+	/* hp used DAC 3 (Front) */
>+	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
>         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
> 	{ }
> };
>@@ -7526,7 +11733,8 @@ static struct hda_verb alc861_uniwill_m31_init_verbs[] = {
> 	{ 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, 0x24 }, // this has to be set to VREF80
>+	/* this has to be set to VREF80 */
>+	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
> 	/* route front PCM to HP */
> 	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
> 	/* port-F for mic-in (front panel) with vref */
>@@ -7557,7 +11765,7 @@ static struct hda_verb alc861_uniwill_m31_init_verbs[] = {
> 	{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
>+	{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)},
>@@ -7567,7 +11775,8 @@ static struct hda_verb alc861_uniwill_m31_init_verbs[] = {
> 	{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)
>+	/* hp used DAC 3 (Front) */
>+	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
>         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
> 	{ }
> };
>@@ -7576,7 +11785,9 @@ static struct hda_verb alc861_asus_init_verbs[] = {
> 	/*
> 	 * Unmute ADC0 and set the default input to mic-in
> 	 */
>-	/* port-A for surround (rear panel) | according to codec#0 this is the HP jack*/
>+	/* port-A for surround (rear panel)
>+	 * according to codec#0 this is the HP jack
>+	 */
> 	{ 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 }, /* was 0x00 */
> 	/* route front PCM to HP */
> 	{ 0x0e, AC_VERB_SET_CONNECT_SEL, 0x01 },
>@@ -7588,7 +11799,8 @@ static struct hda_verb alc861_asus_init_verbs[] = {
> 	{ 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, 0x24 }, /* this has to be set to VREF80 */
>+	/* this has to be set to VREF80 */
>+	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
> 	/* route front PCM to HP */
> 	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
> 	/* port-F for mic-in (front panel) with vref */
>@@ -7618,7 +11830,7 @@ static struct hda_verb alc861_asus_init_verbs[] = {
> 	{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 */
>+	{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)},
>@@ -7628,7 +11840,8 @@ static struct hda_verb alc861_asus_init_verbs[] = {
> 	{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) */
>+	/* hp used DAC 3 (Front) */
>+	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
> 	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
> 	{ }
> };
>@@ -7647,7 +11860,7 @@ 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_CONNECT_SEL, 0x00}, */
> 	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
> 	
> 	/* Unmute DAC0~3 & spdif out*/
>@@ -7680,21 +11893,21 @@ static struct hda_verb alc861_auto_init_verbs[] = {
> 
> 	{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)},		
>+	{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)},	
>+	{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
>+	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},	/* set Mic 1 */
> 
> 	{ }
> };
> 
> static struct hda_verb alc861_toshiba_init_verbs[] = {
> 	{0x0f, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>-        
>+
> 	{ }
> };
> 
>@@ -7705,22 +11918,15 @@ static void alc861_toshiba_automute(struct hda_codec *codec)
> 
> 	present = snd_hda_codec_read(codec, 0x0f, 0,
> 				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>-	snd_hda_codec_amp_update(codec, 0x16, 0, HDA_INPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_amp_update(codec, 0x16, 1, HDA_INPUT, 0,
>-				 0x80, present ? 0x80 : 0);
>-	snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_INPUT, 3,
>-				 0x80, present ? 0 : 0x80);
>-	snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_INPUT, 3,
>-				 0x80, present ? 0 : 0x80);
>+	snd_hda_codec_amp_stereo(codec, 0x16, HDA_INPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+	snd_hda_codec_amp_stereo(codec, 0x1a, HDA_INPUT, 3,
>+				 HDA_AMP_MUTE, present ? 0 : HDA_AMP_MUTE);
> }
> 
> static void alc861_toshiba_unsol_event(struct hda_codec *codec,
> 				       unsigned int res)
> {
>-	/* Looks like the unsol event is incompatible with the standard
>-	 * definition.  6bit tag is placed at 26 bit!
>-	 */
> 	if ((res >> 26) == ALC880_HP_EVENT)
> 		alc861_toshiba_automute(codec);
> }
>@@ -7765,7 +11971,8 @@ static struct hda_input_mux alc861_capture_source = {
> };
> 
> /* 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)
>+static int alc861_auto_fill_dac_nids(struct alc_spec *spec,
>+				     const struct auto_pin_cfg *cfg)
> {
> 	int i;
> 	hda_nid_t nid;
>@@ -7788,29 +11995,40 @@ 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" };
>+	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)
>+		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)
>+			err = add_control(spec, ALC_CTL_BIND_MUTE,
>+					  "Center Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 1, 0,
>+							      HDA_OUTPUT));
>+			if (err < 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)
>+			err = add_control(spec, ALC_CTL_BIND_MUTE,
>+					  "LFE Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 2, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
> 				return err;
> 		} else {
>-			for (idx = 0; idx < ARRAY_SIZE(alc861_dac_nids) - 1; idx++)
>+			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)
>+			err = add_control(spec, ALC_CTL_BIND_MUTE, name,
>+					  HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
> 				return err;
> 		}
> 	}
>@@ -7822,13 +12040,15 @@ static int alc861_auto_create_hp_ctls(struct alc_spec *spec, hda_nid_t pin)
> 	int err;
> 	hda_nid_t nid;
> 
>-	if (! pin)
>+	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)
>+		err = add_control(spec, ALC_CTL_WIDGET_MUTE,
>+				  "Headphone Playback Switch",
>+				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));
>+		if (err < 0)
> 			return err;
> 		spec->multiout.hp_nid = nid;
> 	}
>@@ -7836,32 +12056,33 @@ static int alc861_auto_create_hp_ctls(struct alc_spec *spec, hda_nid_t pin)
> }
> 
> /* 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)
>+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]) {
>+		switch (cfg->input_pins[i]) {
> 		case 0x0c:
> 			idx1 = 1;
>-			idx = 2;	// Line In
>+			idx = 2;	/* Line In */
> 			break;
> 		case 0x0f:
> 			idx1 = 2;
>-			idx = 2;	// Line In
>+			idx = 2;	/* Line In */
> 			break;
> 		case 0x0d:
> 			idx1 = 0;
>-			idx = 1;	// Mic In 
>+			idx = 1;	/* Mic In */
> 			break;
>-		case 0x10:	
>+		case 0x10:
> 			idx1 = 3;
>-			idx = 1;	// Mic In 
>+			idx = 1;	/* Mic In */
> 			break;
> 		case 0x11:
> 			idx1 = 4;
>-			idx = 0;	// CD
>+			idx = 0;	/* CD */
> 			break;
> 		default:
> 			continue;
>@@ -7874,7 +12095,7 @@ static int alc861_auto_create_analog_input_ctls(struct alc_spec *spec, const str
> 
> 		imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
> 		imux->items[imux->num_items].index = idx1;
>-		imux->num_items++;	
>+		imux->num_items++;
> 	}
> 	return 0;
> }
>@@ -7887,7 +12108,6 @@ static struct snd_kcontrol_new alc861_capture_mixer[] = {
> 		.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",
>@@ -7899,14 +12119,14 @@ static struct snd_kcontrol_new alc861_capture_mixer[] = {
> 	{ } /* end */
> };
> 
>-static void alc861_auto_set_output_and_unmute(struct hda_codec *codec, hda_nid_t nid,
>+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);
>-
>+	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)
>@@ -7914,10 +12134,13 @@ static void alc861_auto_init_multi_out(struct hda_codec *codec)
> 	struct alc_spec *spec = codec->spec;
> 	int i;
> 
>+	alc_subsystem_id(codec, 0x0e, 0x0f, 0x0b);
> 	for (i = 0; i < spec->autocfg.line_outs; i++) {
> 		hda_nid_t nid = spec->autocfg.line_out_pins[i];
>+		int pin_type = get_pin_type(spec->autocfg.line_out_type);
> 		if (nid)
>-			alc861_auto_set_output_and_unmute(codec, nid, PIN_OUT, spec->multiout.dac_nids[i]);
>+			alc861_auto_set_output_and_unmute(codec, nid, pin_type,
>+							  spec->multiout.dac_nids[i]);
> 	}
> }
> 
>@@ -7928,7 +12151,11 @@ static void alc861_auto_init_hp_out(struct hda_codec *codec)
> 
> 	pin = spec->autocfg.hp_pins[0];
> 	if (pin) /* connect to front */
>-		alc861_auto_set_output_and_unmute(codec, pin, PIN_HP, spec->multiout.dac_nids[0]);
>+		alc861_auto_set_output_and_unmute(codec, pin, PIN_HP,
>+						  spec->multiout.dac_nids[0]);
>+	pin = spec->autocfg.speaker_pins[0];
>+	if (pin)
>+		alc861_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
> }
> 
> static void alc861_auto_init_analog_input(struct hda_codec *codec)
>@@ -7938,31 +12165,43 @@ static void alc861_auto_init_analog_input(struct hda_codec *codec)
> 
> 	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);
>+		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 */
>+/* 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)
>+	err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>+					   alc861_ignore);
>+	if (err < 0)
> 		return err;
>-	if (! spec->autocfg.line_outs)
>+	if (!spec->autocfg.line_outs)
> 		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_pins[0])) < 0 ||
>-	    (err = alc861_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
>+	err = alc861_auto_fill_dac_nids(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc861_auto_create_multi_out_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc861_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
>+	if (err < 0)
>+		return err;
>+	err = alc861_auto_create_analog_input_ctls(spec, &spec->autocfg);
>+	if (err < 0)
> 		return err;
> 
> 	spec->multiout.max_channels = spec->multiout.num_dacs * 2;
>@@ -7989,11 +12228,24 @@ static int alc861_parse_auto_config(struct hda_codec *codec)
> /* additional initialization for auto-configuration model */
> static void alc861_auto_init(struct hda_codec *codec)
> {
>+	struct alc_spec *spec = codec->spec;
> 	alc861_auto_init_multi_out(codec);
> 	alc861_auto_init_hp_out(codec);
> 	alc861_auto_init_analog_input(codec);
>+	if (spec->unsol_event)
>+		alc_sku_automute(codec);
> }
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list alc861_loopbacks[] = {
>+	{ 0x15, HDA_INPUT, 0 },
>+	{ 0x15, HDA_INPUT, 1 },
>+	{ 0x15, HDA_INPUT, 2 },
>+	{ 0x15, HDA_INPUT, 3 },
>+	{ } /* end */
>+};
>+#endif
>+
> 
> /*
>  * configuration and preset
>@@ -8015,11 +12267,21 @@ static struct snd_pci_quirk alc861_cfg_tbl[] = {
> 	SND_PCI_QUIRK(0x1043, 0x1335, "ASUS F2/3", ALC861_ASUS_LAPTOP),
> 	SND_PCI_QUIRK(0x1043, 0x1338, "ASUS F2/3", ALC861_ASUS_LAPTOP),
> 	SND_PCI_QUIRK(0x1043, 0x1393, "ASUS", ALC861_ASUS),
>-	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS", ALC660_3ST),
>+	SND_PCI_QUIRK(0x1043, 0x13d7, "ASUS A9rp", ALC861_ASUS_LAPTOP),
>+	SND_PCI_QUIRK(0x1043, 0x81cb, "ASUS P1-AH2", ALC861_3ST_DIG),
> 	SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba", ALC861_TOSHIBA),
>-	SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba", ALC861_TOSHIBA),
>-	SND_PCI_QUIRK(0x1584, 0x9072, "Uniwill m31", ALC861_UNIWILL_M31),
>+	/* FIXME: the entry below breaks Toshiba A100 (model=auto works!)
>+	 *        Any other models that need this preset?
>+	 */
>+	/* SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba", ALC861_TOSHIBA), */
>+	SND_PCI_QUIRK(0x1462, 0x7254, "HP dx2200 (MSI MS-7254)", ALC861_3ST),
>+	SND_PCI_QUIRK(0x1462, 0x7297, "HP dx2250 (MSI MS-7297)", ALC861_3ST),
> 	SND_PCI_QUIRK(0x1584, 0x2b01, "Uniwill X40AIx", ALC861_UNIWILL_M31),
>+	SND_PCI_QUIRK(0x1584, 0x9072, "Uniwill m31", ALC861_UNIWILL_M31),
>+	SND_PCI_QUIRK(0x1584, 0x9075, "Airis Praxis N1212", ALC861_ASUS_LAPTOP),
>+	/* FIXME: the below seems conflict */
>+	/* SND_PCI_QUIRK(0x1584, 0x9075, "Uniwill", ALC861_UNIWILL_M31), */
>+	SND_PCI_QUIRK(0x1849, 0x0660, "Asrock 939SLI32", ALC660_3ST),
> 	SND_PCI_QUIRK(0x8086, 0xd600, "Intel", ALC861_3ST),
> 	{}
> };
>@@ -8089,7 +12351,8 @@ static struct alc_config_preset alc861_presets[] = {
> 	},
> 	[ALC861_TOSHIBA] = {
> 		.mixers = { alc861_toshiba_mixer },
>-		.init_verbs = { alc861_base_init_verbs, alc861_toshiba_init_verbs },
>+		.init_verbs = { alc861_base_init_verbs,
>+				alc861_toshiba_init_verbs },
> 		.num_dacs = ARRAY_SIZE(alc861_dac_nids),
> 		.dac_nids = alc861_dac_nids,
> 		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
>@@ -8141,7 +12404,7 @@ static int patch_alc861(struct hda_codec *codec)
> 	if (spec == NULL)
> 		return -ENOMEM;
> 
>-	codec->spec = spec;	
>+	codec->spec = spec;
> 
>         board_config = snd_hda_check_board_config(codec, ALC861_MODEL_LAST,
> 						  alc861_models,
>@@ -8159,7 +12422,7 @@ static int patch_alc861(struct hda_codec *codec)
> 		if (err < 0) {
> 			alc_free(codec);
> 			return err;
>-		} else if (! err) {
>+		} else if (!err) {
> 			printk(KERN_INFO
> 			       "hda_codec: Cannot set up configuration "
> 			       "from BIOS.  Using base mode...\n");
>@@ -8178,9 +12441,15 @@ static int patch_alc861(struct hda_codec *codec)
> 	spec->stream_digital_playback = &alc861_pcm_digital_playback;
> 	spec->stream_digital_capture = &alc861_pcm_digital_capture;
> 
>+	spec->vmaster_nid = 0x03;
>+
> 	codec->patch_ops = alc_patch_ops;
> 	if (board_config == ALC861_AUTO)
> 		spec->init_hook = alc861_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	if (!spec->loopback.amplist)
>+		spec->loopback.amplist = alc861_loopbacks;
>+#endif
> 		
> 	return 0;
> }
>@@ -8216,6 +12485,8 @@ static hda_nid_t alc861vd_adc_nids[1] = {
> 	0x09,
> };
> 
>+static hda_nid_t alc861vd_capsrc_nids[1] = { 0x22 };
>+
> /* input MUX */
> /* FIXME: should be a matrix-type input source selection */
> static struct hda_input_mux alc861vd_capture_source = {
>@@ -8228,34 +12499,26 @@ static struct hda_input_mux alc861vd_capture_source = {
> 	},
> };
> 
>-#define alc861vd_mux_enum_info alc_mux_enum_info
>-#define alc861vd_mux_enum_get alc_mux_enum_get
>+static struct hda_input_mux alc861vd_dallas_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "Ext Mic", 0x0 },
>+		{ "Int Mic", 0x1 },
>+	},
>+};
> 
>-static int alc861vd_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[1] = { 0x22 };
>-	hda_nid_t nid = capture_mixers[adc_idx];
>-	unsigned int *cur_val = &spec->cur_mux[adc_idx];
>-	unsigned int i, idx;
>+static struct hda_input_mux alc861vd_hp_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "Front Mic", 0x0 },
>+		{ "ATAPI Mic", 0x1 },
>+	},
>+};
> 
>-	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;
>-}
>+#define alc861vd_mux_enum_info alc_mux_enum_info
>+#define alc861vd_mux_enum_get alc_mux_enum_get
>+/* ALC861VD has the ALC882-type input selection (but has only one ADC) */
>+#define alc861vd_mux_enum_put alc882_mux_enum_put
> 
> /*
>  * 2ch mode
>@@ -8310,7 +12573,6 @@ static struct snd_kcontrol_new alc861vd_capture_mixer[] = {
> 		.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",
>@@ -8390,6 +12652,62 @@ static struct snd_kcontrol_new alc861vd_3st_mixer[] = {
> 	{ } /* end */
> };
> 
>+static struct snd_kcontrol_new alc861vd_lenovo_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	/*HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),*/
>+	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, 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 Boost", 0x19, 0, 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("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
>+	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
>+
>+	{ } /* end */
>+};
>+
>+/* Pin assignment: Speaker=0x14, HP = 0x15,
>+ *                 Ext Mic=0x18, Int Mic = 0x19, CD = 0x1c, PC Beep = 0x1d
>+ */
>+static struct snd_kcontrol_new alc861vd_dallas_mixer[] = {
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("PC Beep Volume", 0x0b, 0x05, HDA_INPUT),
>+	HDA_CODEC_MUTE("PC Beep Switch", 0x0b, 0x05, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+/* Pin assignment: Speaker=0x14, Line-out = 0x15,
>+ *                 Front Mic=0x18, ATAPI Mic = 0x19,
>+ */
>+static struct snd_kcontrol_new alc861vd_hp_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("ATAPI Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	
>+	{ } /* end */
>+};
>+
> /*
>  * generic initialization of ADC, input mixers and output mixers
>  */
>@@ -8404,17 +12722,17 @@ static struct hda_verb alc861vd_volume_init_verbs[] = {
> 	 * the analog-loopback mixer widget
> 	 */
> 	/* 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)},
>+	{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)},
> 
> 	/* Capture mixer: unmute Mic, F-Mic, Line, CD inputs */
>+	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
> 	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},
>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(6)},
>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(8)},
> 
> 	/*
> 	 * Set up output mixers (0x02 - 0x05)
>@@ -8515,6 +12833,136 @@ static struct hda_verb alc861vd_6stack_init_verbs[] = {
> 	{ }
> };
> 
>+static struct hda_verb alc861vd_eapd_verbs[] = {
>+	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
>+	{ }
>+};
>+
>+static struct hda_verb alc660vd_eapd_verbs[] = {
>+	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
>+	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
>+	{ }
>+};
>+
>+static struct hda_verb alc861vd_lenovo_unsol_verbs[] = {
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
>+	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},	
>+	{}
>+};
>+
>+/* toggle speaker-output according to the hp-jack state */
>+static void alc861vd_lenovo_hp_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+	present = snd_hda_codec_read(codec, 0x1b, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc861vd_lenovo_mic_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+	present = snd_hda_codec_read(codec, 0x18, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc861vd_lenovo_automute(struct hda_codec *codec)
>+{
>+	alc861vd_lenovo_hp_automute(codec);
>+	alc861vd_lenovo_mic_automute(codec);
>+}
>+
>+static void alc861vd_lenovo_unsol_event(struct hda_codec *codec,
>+					unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case ALC880_HP_EVENT:
>+		alc861vd_lenovo_hp_automute(codec);
>+		break;
>+	case ALC880_MIC_EVENT:
>+		alc861vd_lenovo_mic_automute(codec);
>+		break;
>+	}
>+}
>+
>+static struct hda_verb alc861vd_dallas_verbs[] = {
>+	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+
>+	{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_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)},
>+	
>+	{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_VREF50},
>+	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},
>+	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
>+	{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},
>+	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
>+
>+	{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)},
>+
>+	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},	
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+
>+	{ } /* end */
>+};
>+
>+/* toggle speaker-output according to the hp-jack state */
>+static void alc861vd_dallas_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x15, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
>+}
>+
>+static void alc861vd_dallas_unsol_event(struct hda_codec *codec, unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc861vd_dallas_automute(codec);
>+}
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+#define alc861vd_loopbacks	alc880_loopbacks
>+#endif
>+
> /* pcm configuration: identiacal with ALC880 */
> #define alc861vd_pcm_analog_playback	alc880_pcm_analog_playback
> #define alc861vd_pcm_analog_capture	alc880_pcm_analog_capture
>@@ -8526,18 +12974,32 @@ static struct hda_verb alc861vd_6stack_init_verbs[] = {
>  */
> static const char *alc861vd_models[ALC861VD_MODEL_LAST] = {
> 	[ALC660VD_3ST]		= "3stack-660",
>+	[ALC660VD_3ST_DIG]	= "3stack-660-digout",
> 	[ALC861VD_3ST]		= "3stack",
> 	[ALC861VD_3ST_DIG]	= "3stack-digout",
> 	[ALC861VD_6ST_DIG]	= "6stack-digout",
>+	[ALC861VD_LENOVO]	= "lenovo",
>+	[ALC861VD_DALLAS]	= "dallas",
>+	[ALC861VD_HP]		= "hp",
> 	[ALC861VD_AUTO]		= "auto",
> };
> 
> static struct snd_pci_quirk alc861vd_cfg_tbl[] = {
>+	SND_PCI_QUIRK(0x1019, 0xa88d, "Realtek ALC660 demo", ALC660VD_3ST),
>+	SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_HP),
>+	SND_PCI_QUIRK(0x1043, 0x12e2, "Asus z35m", ALC660VD_3ST),
> 	SND_PCI_QUIRK(0x1043, 0x1339, "Asus G1", ALC660VD_3ST),
>+	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS", ALC660VD_3ST_DIG),
> 	SND_PCI_QUIRK(0x10de, 0x03f0, "Realtek ALC660 demo", ALC660VD_3ST),
>-	SND_PCI_QUIRK(0x1019, 0xa88d, "Realtek ALC660 demo", ALC660VD_3ST),
>-
>-	SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo 3000 C200", ALC861VD_3ST),
>+	SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba A135", ALC861VD_LENOVO),
>+	/*SND_PCI_QUIRK(0x1179, 0xff00, "DALLAS", ALC861VD_DALLAS),*/ /*lenovo*/
>+	SND_PCI_QUIRK(0x1179, 0xff01, "DALLAS", ALC861VD_DALLAS),
>+	SND_PCI_QUIRK(0x1179, 0xff03, "Toshiba P205", ALC861VD_LENOVO),
>+	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba L30-149", ALC861VD_DALLAS),
>+	SND_PCI_QUIRK(0x1565, 0x820d, "Biostar NF61S SE", ALC861VD_6ST_DIG),
>+	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo", ALC861VD_LENOVO),
>+	SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo 3000 C200", ALC861VD_LENOVO),
>+	SND_PCI_QUIRK(0x1849, 0x0862, "ASRock K8NF6G-VSTA", ALC861VD_6ST_DIG),
> 	{}
> };
> 
>@@ -8548,8 +13010,17 @@ static struct alc_config_preset alc861vd_presets[] = {
> 				 alc861vd_3stack_init_verbs },
> 		.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),
> 		.dac_nids = alc660vd_dac_nids,
>-		.num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids),
>-		.adc_nids = alc861vd_adc_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
>+		.channel_mode = alc861vd_3stack_2ch_modes,
>+		.input_mux = &alc861vd_capture_source,
>+	},
>+	[ALC660VD_3ST_DIG] = {
>+		.mixers = { alc861vd_3st_mixer },
>+		.init_verbs = { alc861vd_volume_init_verbs,
>+				 alc861vd_3stack_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),
>+		.dac_nids = alc660vd_dac_nids,
>+		.dig_out_nid = ALC861VD_DIGOUT_NID,
> 		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
> 		.channel_mode = alc861vd_3stack_2ch_modes,
> 		.input_mux = &alc861vd_capture_source,
>@@ -8586,6 +13057,43 @@ static struct alc_config_preset alc861vd_presets[] = {
> 		.channel_mode = alc861vd_6stack_modes,
> 		.input_mux = &alc861vd_capture_source,
> 	},
>+	[ALC861VD_LENOVO] = {
>+		.mixers = { alc861vd_lenovo_mixer },
>+		.init_verbs = { alc861vd_volume_init_verbs,
>+				alc861vd_3stack_init_verbs,
>+				alc861vd_eapd_verbs,
>+				alc861vd_lenovo_unsol_verbs },
>+		.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),
>+		.dac_nids = alc660vd_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
>+		.channel_mode = alc861vd_3stack_2ch_modes,
>+		.input_mux = &alc861vd_capture_source,
>+		.unsol_event = alc861vd_lenovo_unsol_event,
>+		.init_hook = alc861vd_lenovo_automute,
>+	},
>+	[ALC861VD_DALLAS] = {
>+		.mixers = { alc861vd_dallas_mixer },
>+		.init_verbs = { alc861vd_dallas_verbs },
>+		.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),
>+		.dac_nids = alc861vd_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
>+		.channel_mode = alc861vd_3stack_2ch_modes,
>+		.input_mux = &alc861vd_dallas_capture_source,
>+		.unsol_event = alc861vd_dallas_unsol_event,
>+		.init_hook = alc861vd_dallas_automute,
>+	},
>+	[ALC861VD_HP] = {
>+		.mixers = { alc861vd_hp_mixer },
>+		.init_verbs = { alc861vd_dallas_verbs, alc861vd_eapd_verbs },
>+		.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),
>+		.dac_nids = alc861vd_dac_nids,
>+		.dig_out_nid = ALC861VD_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
>+		.channel_mode = alc861vd_3stack_2ch_modes,
>+		.input_mux = &alc861vd_hp_capture_source,
>+		.unsol_event = alc861vd_dallas_unsol_event,
>+		.init_hook = alc861vd_dallas_automute,
>+	},		
> };
> 
> /*
>@@ -8594,11 +13102,7 @@ static struct alc_config_preset alc861vd_presets[] = {
> static void alc861vd_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);
>+	alc_set_pin_output(codec, nid, pin_type);
> }
> 
> static void alc861vd_auto_init_multi_out(struct hda_codec *codec)
>@@ -8606,11 +13110,13 @@ static void alc861vd_auto_init_multi_out(struct hda_codec *codec)
> 	struct alc_spec *spec = codec->spec;
> 	int i;
> 
>+	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);
> 	for (i = 0; i <= HDA_SIDE; i++) {
> 		hda_nid_t nid = spec->autocfg.line_out_pins[i];
>+		int pin_type = get_pin_type(spec->autocfg.line_out_type);
> 		if (nid)
> 			alc861vd_auto_set_output_and_unmute(codec, nid,
>-								PIN_OUT, i);
>+							    pin_type, i);
> 	}
> }
> 
>@@ -8623,6 +13129,9 @@ static void alc861vd_auto_init_hp_out(struct hda_codec *codec)
> 	pin = spec->autocfg.hp_pins[0];
> 	if (pin) /* connect to front and  use dac 0 */
> 		alc861vd_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
>+	pin = spec->autocfg.speaker_pins[0];
>+	if (pin)
>+		alc861vd_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
> }
> 
> #define alc861vd_is_input_pin(nid)	alc880_is_input_pin(nid)
>@@ -8663,7 +13172,7 @@ static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
> 	int i, err;
> 
> 	for (i = 0; i < cfg->line_outs; i++) {
>-		if (! spec->multiout.dac_nids[i])
>+		if (!spec->multiout.dac_nids[i])
> 			continue;
> 		nid_v = alc861vd_idx_to_mixer_vol(
> 				alc880_dac_to_idx(
>@@ -8674,36 +13183,42 @@ static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
> 
> 		if (i == 2) {
> 			/* Center/LFE */
>-			if ((err = add_control(spec, ALC_CTL_WIDGET_VOL,
>-						"Center Playback Volume",
>-						HDA_COMPOSE_AMP_VAL(nid_v, 1,
>-							0, HDA_OUTPUT))) < 0)
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+					  "Center Playback Volume",
>+					  HDA_COMPOSE_AMP_VAL(nid_v, 1, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
> 				return err;
>-			if ((err = add_control(spec, ALC_CTL_WIDGET_VOL,
>-						"LFE Playback Volume",
>-						HDA_COMPOSE_AMP_VAL(nid_v, 2,
>-							0, HDA_OUTPUT))) < 0)
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+					  "LFE Playback Volume",
>+					  HDA_COMPOSE_AMP_VAL(nid_v, 2, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
> 				return err;
>-			if ((err = add_control(spec, ALC_CTL_BIND_MUTE,
>-						"Center Playback Switch",
>-						HDA_COMPOSE_AMP_VAL(nid_s, 1,
>-						2, HDA_INPUT))) < 0)
>+			err = add_control(spec, ALC_CTL_BIND_MUTE,
>+					  "Center Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid_s, 1, 2,
>+							      HDA_INPUT));
>+			if (err < 0)
> 				return err;
>-			if ((err = add_control(spec, ALC_CTL_BIND_MUTE,
>-						"LFE Playback Switch",
>-						HDA_COMPOSE_AMP_VAL(nid_s, 2,
>-						2, HDA_INPUT))) < 0)
>+			err = add_control(spec, ALC_CTL_BIND_MUTE,
>+					  "LFE Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid_s, 2, 2,
>+							      HDA_INPUT));
>+			if (err < 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_v, 3,
>-							0, HDA_OUTPUT))) < 0)
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
>+					  HDA_COMPOSE_AMP_VAL(nid_v, 3, 0,
>+							      HDA_OUTPUT));
>+			if (err < 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_v, 3,
>-							2, HDA_INPUT))) < 0)
>+			err = add_control(spec, ALC_CTL_BIND_MUTE, name,
>+					  HDA_COMPOSE_AMP_VAL(nid_s, 3, 2,
>+							      HDA_INPUT));
>+			if (err < 0)
> 				return err;
> 		}
> 	}
>@@ -8720,13 +13235,13 @@ static int alc861vd_auto_create_extra_out(struct alc_spec *spec,
> 	int err;
> 	char name[32];
> 
>-	if (! pin)
>+	if (!pin)
> 		return 0;
> 
> 	if (alc880_is_fixed_pin(pin)) {
> 		nid_v = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));
> 		/* specify the DAC as the extra output */
>-		if (! spec->multiout.hp_nid)
>+		if (!spec->multiout.hp_nid)
> 			spec->multiout.hp_nid = nid_v;
> 		else
> 			spec->multiout.extra_out_nid[0] = nid_v;
>@@ -8737,22 +13252,22 @@ static int alc861vd_auto_create_extra_out(struct alc_spec *spec,
> 				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_v, 3, 0,
>-							HDA_OUTPUT))) < 0)
>+		err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
>+				  HDA_COMPOSE_AMP_VAL(nid_v, 3, 0, HDA_OUTPUT));
>+		if (err < 0)
> 			return err;
> 		sprintf(name, "%s Playback Switch", pfx);
>-		if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
>-				HDA_COMPOSE_AMP_VAL(nid_s, 3, 2,
>-							HDA_INPUT))) < 0)
>+		err = add_control(spec, ALC_CTL_BIND_MUTE, name,
>+				  HDA_COMPOSE_AMP_VAL(nid_s, 3, 2, HDA_INPUT));
>+		if (err < 0)
> 			return err;
> 	} else if (alc880_is_multi_pin(pin)) {
> 		/* set manual connection */
> 		/* 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)
>+		err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
>+				  HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
>+		if (err < 0)
> 			return err;
> 	}
> 	return 0;
>@@ -8769,21 +13284,31 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec)
> 	int err;
> 	static hda_nid_t alc861vd_ignore[] = { 0x1d, 0 };
> 
>-	if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>-						alc861vd_ignore)) < 0)
>+	err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>+					   alc861vd_ignore);
>+	if (err < 0)
> 		return err;
>-	if (! spec->autocfg.line_outs)
>+	if (!spec->autocfg.line_outs)
> 		return 0; /* can't find valid BIOS pin config */
> 
>-	if ((err = alc880_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 ||
>-		(err = alc861vd_auto_create_multi_out_ctls(spec,
>-			&spec->autocfg)) < 0 ||
>-		(err = alc861vd_auto_create_extra_out(spec,
>-			spec->autocfg.speaker_pins[0], "Speaker")) < 0 ||
>-		(err = alc861vd_auto_create_extra_out(spec,
>-			spec->autocfg.hp_pins[0], "Headphone")) < 0 ||
>-		(err = alc880_auto_create_analog_input_ctls(spec,
>-			&spec->autocfg)) < 0)
>+	err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc861vd_auto_create_extra_out(spec,
>+					     spec->autocfg.speaker_pins[0],
>+					     "Speaker");
>+	if (err < 0)
>+		return err;
>+	err = alc861vd_auto_create_extra_out(spec,
>+					     spec->autocfg.hp_pins[0],
>+					     "Headphone");
>+	if (err < 0)
>+		return err;
>+	err = alc880_auto_create_analog_input_ctls(spec, &spec->autocfg);
>+	if (err < 0)
> 		return err;
> 
> 	spec->multiout.max_channels = spec->multiout.num_dacs * 2;
>@@ -8800,15 +13325,22 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec)
> 	spec->num_mux_defs = 1;
> 	spec->input_mux = &spec->private_imux;
> 
>+	err = alc_auto_add_mic_boost(codec);
>+	if (err < 0)
>+		return err;
>+
> 	return 1;
> }
> 
> /* additional initialization for auto-configuration model */
> static void alc861vd_auto_init(struct hda_codec *codec)
> {
>+	struct alc_spec *spec = codec->spec;
> 	alc861vd_auto_init_multi_out(codec);
> 	alc861vd_auto_init_hp_out(codec);
> 	alc861vd_auto_init_analog_input(codec);
>+	if (spec->unsol_event)
>+		alc_sku_automute(codec);
> }
> 
> static int patch_alc861vd(struct hda_codec *codec)
>@@ -8838,7 +13370,7 @@ static int patch_alc861vd(struct hda_codec *codec)
> 		if (err < 0) {
> 			alc_free(codec);
> 			return err;
>-		} else if (! err) {
>+		} else if (!err) {
> 			printk(KERN_INFO
> 			       "hda_codec: Cannot set up configuration "
> 			       "from BIOS.  Using base mode...\n");
>@@ -8849,24 +13381,1255 @@ static int patch_alc861vd(struct hda_codec *codec)
> 	if (board_config != ALC861VD_AUTO)
> 		setup_preset(spec, &alc861vd_presets[board_config]);
> 
>-	spec->stream_name_analog = "ALC861VD Analog";
>+	if (codec->vendor_id == 0x10ec0660) {
>+		spec->stream_name_analog = "ALC660-VD Analog";
>+		spec->stream_name_digital = "ALC660-VD Digital";
>+		/* always turn on EAPD */
>+		spec->init_verbs[spec->num_init_verbs++] = alc660vd_eapd_verbs;
>+	} else {
>+		spec->stream_name_analog = "ALC861VD Analog";
>+		spec->stream_name_digital = "ALC861VD Digital";
>+	}
>+
> 	spec->stream_analog_playback = &alc861vd_pcm_analog_playback;
> 	spec->stream_analog_capture = &alc861vd_pcm_analog_capture;
> 
>-	spec->stream_name_digital = "ALC861VD Digital";
> 	spec->stream_digital_playback = &alc861vd_pcm_digital_playback;
> 	spec->stream_digital_capture = &alc861vd_pcm_digital_capture;
> 
> 	spec->adc_nids = alc861vd_adc_nids;
> 	spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids);
>+	spec->capsrc_nids = alc861vd_capsrc_nids;
> 
> 	spec->mixers[spec->num_mixers] = alc861vd_capture_mixer;
> 	spec->num_mixers++;
> 
>+	spec->vmaster_nid = 0x02;
>+
> 	codec->patch_ops = alc_patch_ops;
> 
> 	if (board_config == ALC861VD_AUTO)
> 		spec->init_hook = alc861vd_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	if (!spec->loopback.amplist)
>+		spec->loopback.amplist = alc861vd_loopbacks;
>+#endif
>+
>+	return 0;
>+}
>+
>+/*
>+ * ALC662 support
>+ *
>+ * ALC662 is almost identical with ALC880 but has cleaner and more flexible
>+ * configuration.  Each pin widget can choose any input DACs and a mixer.
>+ * Each ADC is connected from a mixer of all inputs.  This makes possible
>+ * 6-channel independent captures.
>+ *
>+ * In addition, an independent DAC for the multi-playback (not used in this
>+ * driver yet).
>+ */
>+#define ALC662_DIGOUT_NID	0x06
>+#define ALC662_DIGIN_NID	0x0a
>+
>+static hda_nid_t alc662_dac_nids[4] = {
>+	/* front, rear, clfe, rear_surr */
>+	0x02, 0x03, 0x04
>+};
>+
>+static hda_nid_t alc662_adc_nids[1] = {
>+	/* ADC1-2 */
>+	0x09,
>+};
>+
>+static hda_nid_t alc662_capsrc_nids[1] = { 0x22 };
>+
>+/* input MUX */
>+/* FIXME: should be a matrix-type input source selection */
>+static struct hda_input_mux alc662_capture_source = {
>+	.num_items = 4,
>+	.items = {
>+		{ "Mic", 0x0 },
>+		{ "Front Mic", 0x1 },
>+		{ "Line", 0x2 },
>+		{ "CD", 0x4 },
>+	},
>+};
>+
>+static struct hda_input_mux alc662_lenovo_101e_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "Mic", 0x1 },
>+		{ "Line", 0x2 },
>+	},
>+};
>+
>+static struct hda_input_mux alc662_eeepc_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "i-Mic", 0x1 },
>+		{ "e-Mic", 0x0 },
>+	},
>+};
>+
>+static struct hda_input_mux alc663_capture_source = {
>+	.num_items = 3,
>+	.items = {
>+		{ "Mic", 0x0 },
>+		{ "Front Mic", 0x1 },
>+		{ "Line", 0x2 },
>+	},
>+};
>+
>+static struct hda_input_mux alc663_m51va_capture_source = {
>+	.num_items = 2,
>+	.items = {
>+		{ "Ext-Mic", 0x0 },
>+		{ "D-Mic", 0x9 },
>+	},
>+};
>+
>+#define alc662_mux_enum_info alc_mux_enum_info
>+#define alc662_mux_enum_get alc_mux_enum_get
>+#define alc662_mux_enum_put alc882_mux_enum_put
>+
>+/*
>+ * 2ch mode
>+ */
>+static struct hda_channel_mode alc662_3ST_2ch_modes[1] = {
>+	{ 2, NULL }
>+};
>+
>+/*
>+ * 2ch mode
>+ */
>+static struct hda_verb alc662_3ST_ch2_init[] = {
>+	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
>+	{ 0x18, 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 },
>+	{ } /* end */
>+};
>+
>+/*
>+ * 6ch mode
>+ */
>+static struct hda_verb alc662_3ST_ch6_init[] = {
>+	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
>+	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },
>+	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
>+	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },
>+	{ } /* end */
>+};
>+
>+static struct hda_channel_mode alc662_3ST_6ch_modes[2] = {
>+	{ 2, alc662_3ST_ch2_init },
>+	{ 6, alc662_3ST_ch6_init },
>+};
>+
>+/*
>+ * 2ch mode
>+ */
>+static struct hda_verb alc662_sixstack_ch6_init[] = {
>+	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
>+	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
>+	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
>+	{ } /* end */
>+};
>+
>+/*
>+ * 6ch mode
>+ */
>+static struct hda_verb alc662_sixstack_ch8_init[] = {
>+	{ 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 },
>+	{ } /* end */
>+};
>+
>+static struct hda_channel_mode alc662_5stack_modes[2] = {
>+	{ 2, alc662_sixstack_ch6_init },
>+	{ 6, alc662_sixstack_ch8_init },
>+};
>+
>+/* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17
>+ *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b
>+ */
>+
>+static struct snd_kcontrol_new alc662_base_mixer[] = {
>+	/* output mixer control */
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Surround Playback Volume", 0x3, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Surround Playback Switch", 0x0d, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x0e, 1, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
>+
>+	/*Input mixer control */
>+	HDA_CODEC_VOLUME("CD Playback Volume", 0xb, 0x4, HDA_INPUT),
>+	HDA_CODEC_MUTE("CD Playback Switch", 0xb, 0x4, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Line Playback Volume", 0xb, 0x02, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line Playback Switch", 0xb, 0x02, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0xb, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0xb, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0xb, 0x01, HDA_INPUT),
>+	HDA_CODEC_MUTE("Front Mic Playback Switch", 0xb, 0x01, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc662_3ST_2ch_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, 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),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc662_3ST_6ch_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Surround Playback Switch", 0x0d, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x0e, 1, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 0x0, 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),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc662_lenovo_101e_mixer[] = {
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Front Playback Switch", 0x02, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x03, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Speaker Playback Switch", 0x03, 2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
>+	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, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc662_eeepc_p701_mixer[] = {
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME("Line-Out Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Line-Out Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME("e-Mic Boost", 0x18, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("e-Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("e-Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("i-Mic Boost", 0x19, 0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = {
>+	HDA_CODEC_VOLUME("Line-Out Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Line-Out Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("Surround Playback Switch", 0x03, 2, HDA_INPUT),
>+	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x04, 1, 2, HDA_INPUT),
>+	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x04, 2, 2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
>+	HDA_BIND_MUTE("MuteCtrl Playback Switch", 0x0c, 2, 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),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc663_m51va_mixer[] = {
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("DMic Playback Switch", 0x23, 0x9, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc663_g71v_mixer[] = {
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME("Front Playback Volume", 0x03, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc663_g50v_mixer[] = {
>+	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
>+	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new alc662_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,
>+	},
>+	{ } /* end */
>+};
>+
>+static struct hda_verb alc662_init_verbs[] = {
>+	/* ADC: mute amp left and right */
>+	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
>+	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	/* Front mixer: unmute input/output amp left and right (volume = 0) */
>+
>+	{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)},
>+
>+	{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)},
>+
>+	/* Front Pin: output 0 (0x0c) */
>+	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+
>+	/* Rear Pin: output 1 (0x0d) */
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+
>+	/* CLFE Pin: output 2 (0x0e) */
>+	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+
>+	/* 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 mixer */
>+	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
>+	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
>+
>+	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
>+	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
>+
>+	/* always trun on EAPD */
>+	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
>+	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
>+
>+	{ }
>+};
>+
>+static struct hda_verb alc662_sue_init_verbs[] = {
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_FRONT_EVENT},
>+	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_HP_EVENT},
>+	{}
>+};
>+
>+static struct hda_verb alc662_eeepc_sue_init_verbs[] = {
>+	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
>+	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	{}
>+};
>+
>+/* Set Unsolicited Event*/
>+static struct hda_verb alc662_eeepc_ep20_sue_init_verbs[] = {
>+	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	{}
>+};
>+
>+/*
>+ * generic initialization of ADC, input mixers and output mixers
>+ */
>+static struct hda_verb alc662_auto_init_verbs[] = {
>+	/*
>+	 * Unmute ADC and set the default input to mic-in
>+	 */
>+	{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_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)},
>+
>+	/*
>+	 * Set up output mixers (0x0c - 0x0f)
>+	 */
>+	/* set vol=0 to output mixers */
>+	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x04, 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 mixer */
>+	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{ }
>+};
>+
>+static struct hda_verb alc663_m51va_init_verbs[] = {
>+	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{0x21, AC_VERB_SET_CONNECT_SEL, 0x00},	/* Headphone */
>+
>+	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},
>+
>+	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
>+	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	{}
>+};
>+
>+static struct hda_verb alc663_g71v_init_verbs[] = {
>+	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	/* {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, */
>+	/* {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, */ /* Headphone */
>+
>+	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{0x21, AC_VERB_SET_CONNECT_SEL, 0x00},	/* Headphone */
>+
>+	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_FRONT_EVENT},
>+	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_MIC_EVENT},
>+	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_HP_EVENT},
>+	{}
>+};
>+
>+static struct hda_verb alc663_g50v_init_verbs[] = {
>+	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
>+	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
>+	{0x21, AC_VERB_SET_CONNECT_SEL, 0x00},	/* Headphone */
>+
>+	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
>+	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
>+	{}
>+};
>+
>+/* capture mixer elements */
>+static struct snd_kcontrol_new alc662_capture_mixer[] = {
>+	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		/* The multiple "Capture Source" controls confuse alsamixer
>+		 * So call somewhat different..
>+		 */
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 1,
>+		.info = alc662_mux_enum_info,
>+		.get = alc662_mux_enum_get,
>+		.put = alc662_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+
>+static void alc662_lenovo_101e_ispeaker_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+	present = snd_hda_codec_read(codec, 0x14, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc662_lenovo_101e_all_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+ 	present = snd_hda_codec_read(codec, 0x1b, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc662_lenovo_101e_unsol_event(struct hda_codec *codec,
>+					   unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc662_lenovo_101e_all_automute(codec);
>+	if ((res >> 26) == ALC880_FRONT_EVENT)
>+		alc662_lenovo_101e_ispeaker_automute(codec);
>+}
>+
>+static void alc662_eeepc_mic_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x18, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
>+	snd_hda_codec_write(codec, 0x22, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>+			    0x7000 | (0x00 << 8) | (present ? 0 : 0x80));
>+	snd_hda_codec_write(codec, 0x23, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>+			    0x7000 | (0x00 << 8) | (present ? 0 : 0x80));
>+	snd_hda_codec_write(codec, 0x22, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>+			    0x7000 | (0x01 << 8) | (present ? 0x80 : 0));
>+	snd_hda_codec_write(codec, 0x23, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>+			    0x7000 | (0x01 << 8) | (present ? 0x80 : 0));
>+}
>+
>+/* unsolicited event for HP jack sensing */
>+static void alc662_eeepc_unsol_event(struct hda_codec *codec,
>+				     unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc262_hippo1_automute( codec );
>+
>+	if ((res >> 26) == ALC880_MIC_EVENT)
>+		alc662_eeepc_mic_automute(codec);
>+}
>+
>+static void alc662_eeepc_inithook(struct hda_codec *codec)
>+{
>+	alc262_hippo1_automute( codec );
>+	alc662_eeepc_mic_automute(codec);
>+}
>+
>+static void alc662_eeepc_ep20_automute(struct hda_codec *codec)
>+{
>+	unsigned int mute;
>+	unsigned int present;
>+
>+	snd_hda_codec_read(codec, 0x14, 0, AC_VERB_SET_PIN_SENSE, 0);
>+	present = snd_hda_codec_read(codec, 0x14, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0);
>+	present = (present & 0x80000000) != 0;
>+	if (present) {
>+		/* mute internal speaker */
>+		snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, HDA_AMP_MUTE);
>+	} else {
>+		/* unmute internal speaker if necessary */
>+		mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);
>+		snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
>+					 HDA_AMP_MUTE, mute);
>+	}
>+}
>+
>+/* unsolicited event for HP jack sensing */
>+static void alc662_eeepc_ep20_unsol_event(struct hda_codec *codec,
>+					  unsigned int res)
>+{
>+	if ((res >> 26) == ALC880_HP_EVENT)
>+		alc662_eeepc_ep20_automute(codec);
>+}
>+
>+static void alc662_eeepc_ep20_inithook(struct hda_codec *codec)
>+{
>+	alc662_eeepc_ep20_automute(codec);
>+}
>+
>+static void alc663_m51va_speaker_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+	present = snd_hda_codec_read(codec, 0x21, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0)
>+		& AC_PINSENSE_PRESENCE;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc663_m51va_mic_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+
>+	present = snd_hda_codec_read(codec, 0x18, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0)
>+		& AC_PINSENSE_PRESENCE;
>+	snd_hda_codec_write_cache(codec, 0x22, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>+			    0x7000 | (0x00 << 8) | (present ? 0 : 0x80));
>+	snd_hda_codec_write_cache(codec, 0x23, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>+			    0x7000 | (0x00 << 8) | (present ? 0 : 0x80));
>+	snd_hda_codec_write_cache(codec, 0x22, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>+			    0x7000 | (0x09 << 8) | (present ? 0x80 : 0));
>+	snd_hda_codec_write_cache(codec, 0x23, 0, AC_VERB_SET_AMP_GAIN_MUTE,
>+			    0x7000 | (0x09 << 8) | (present ? 0x80 : 0));
>+}
>+
>+static void alc663_m51va_unsol_event(struct hda_codec *codec,
>+					   unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case ALC880_HP_EVENT:
>+		alc663_m51va_speaker_automute(codec);
>+		break;
>+	case ALC880_MIC_EVENT:
>+		alc663_m51va_mic_automute(codec);
>+		break;
>+	}
>+}
>+
>+static void alc663_m51va_inithook(struct hda_codec *codec)
>+{
>+	alc663_m51va_speaker_automute(codec);
>+	alc663_m51va_mic_automute(codec);
>+}
>+
>+static void alc663_g71v_hp_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+	present = snd_hda_codec_read(codec, 0x21, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0)
>+		& AC_PINSENSE_PRESENCE;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc663_g71v_front_automute(struct hda_codec *codec)
>+{
>+	unsigned int present;
>+	unsigned char bits;
>+
>+	present = snd_hda_codec_read(codec, 0x15, 0,
>+				     AC_VERB_GET_PIN_SENSE, 0)
>+		& AC_PINSENSE_PRESENCE;
>+	bits = present ? HDA_AMP_MUTE : 0;
>+	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
>+				 HDA_AMP_MUTE, bits);
>+}
>+
>+static void alc663_g71v_unsol_event(struct hda_codec *codec,
>+					   unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case ALC880_HP_EVENT:
>+		alc663_g71v_hp_automute(codec);
>+		break;
>+	case ALC880_FRONT_EVENT:
>+		alc663_g71v_front_automute(codec);
>+		break;
>+	case ALC880_MIC_EVENT:
>+		alc662_eeepc_mic_automute(codec);
>+		break;
>+	}
>+}
>+
>+static void alc663_g71v_inithook(struct hda_codec *codec)
>+{
>+	alc663_g71v_front_automute(codec);
>+	alc663_g71v_hp_automute(codec);
>+	alc662_eeepc_mic_automute(codec);
>+}
>+
>+static void alc663_g50v_unsol_event(struct hda_codec *codec,
>+					   unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case ALC880_HP_EVENT:
>+		alc663_m51va_speaker_automute(codec);
>+		break;
>+	case ALC880_MIC_EVENT:
>+		alc662_eeepc_mic_automute(codec);
>+		break;
>+	}
>+}
>+
>+static void alc663_g50v_inithook(struct hda_codec *codec)
>+{
>+	alc663_m51va_speaker_automute(codec);
>+	alc662_eeepc_mic_automute(codec);
>+}
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+#define alc662_loopbacks	alc880_loopbacks
>+#endif
>+
>+
>+/* pcm configuration: identiacal with ALC880 */
>+#define alc662_pcm_analog_playback	alc880_pcm_analog_playback
>+#define alc662_pcm_analog_capture	alc880_pcm_analog_capture
>+#define alc662_pcm_digital_playback	alc880_pcm_digital_playback
>+#define alc662_pcm_digital_capture	alc880_pcm_digital_capture
>+
>+/*
>+ * configuration and preset
>+ */
>+static const char *alc662_models[ALC662_MODEL_LAST] = {
>+	[ALC662_3ST_2ch_DIG]	= "3stack-dig",
>+	[ALC662_3ST_6ch_DIG]	= "3stack-6ch-dig",
>+	[ALC662_3ST_6ch]	= "3stack-6ch",
>+	[ALC662_5ST_DIG]	= "6stack-dig",
>+	[ALC662_LENOVO_101E]	= "lenovo-101e",
>+	[ALC662_ASUS_EEEPC_P701] = "eeepc-p701",
>+	[ALC662_ASUS_EEEPC_EP20] = "eeepc-ep20",
>+	[ALC663_ASUS_M51VA] = "m51va",
>+	[ALC663_ASUS_G71V] = "g71v",
>+	[ALC663_ASUS_H13] = "h13",
>+	[ALC663_ASUS_G50V] = "g50v",
>+	[ALC662_AUTO]		= "auto",
>+};
>+
>+static struct snd_pci_quirk alc662_cfg_tbl[] = {
>+	SND_PCI_QUIRK(0x1043, 0x11c3, "ASUS G71V", ALC663_ASUS_G71V),
>+	SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M51VA", ALC663_ASUS_M51VA),
>+	SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS M51VA", ALC663_ASUS_G50V),
>+	SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG),
>+	SND_PCI_QUIRK(0x1043, 0x82a1, "ASUS Eeepc", ALC662_ASUS_EEEPC_P701),
>+	SND_PCI_QUIRK(0x1043, 0x82d1, "ASUS Eeepc EP20", ALC662_ASUS_EEEPC_EP20),
>+	SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo", ALC662_LENOVO_101E),
>+	SND_PCI_QUIRK(0x1854, 0x2000, "ASUS H13-2000", ALC663_ASUS_H13),
>+	SND_PCI_QUIRK(0x1854, 0x2001, "ASUS H13-2001", ALC663_ASUS_H13),
>+	SND_PCI_QUIRK(0x1854, 0x2002, "ASUS H13-2002", ALC663_ASUS_H13),
>+	{}
>+};
>+
>+static struct alc_config_preset alc662_presets[] = {
>+	[ALC662_3ST_2ch_DIG] = {
>+		.mixers = { alc662_3ST_2ch_mixer, alc662_capture_mixer },
>+		.init_verbs = { alc662_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.dig_out_nid = ALC662_DIGOUT_NID,
>+		.dig_in_nid = ALC662_DIGIN_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
>+		.channel_mode = alc662_3ST_2ch_modes,
>+		.input_mux = &alc662_capture_source,
>+	},
>+	[ALC662_3ST_6ch_DIG] = {
>+		.mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer,
>+			    alc662_capture_mixer },
>+		.init_verbs = { alc662_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.dig_out_nid = ALC662_DIGOUT_NID,
>+		.dig_in_nid = ALC662_DIGIN_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),
>+		.channel_mode = alc662_3ST_6ch_modes,
>+		.need_dac_fix = 1,
>+		.input_mux = &alc662_capture_source,
>+	},
>+	[ALC662_3ST_6ch] = {
>+		.mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer,
>+			    alc662_capture_mixer },
>+		.init_verbs = { alc662_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),
>+		.channel_mode = alc662_3ST_6ch_modes,
>+		.need_dac_fix = 1,
>+		.input_mux = &alc662_capture_source,
>+	},
>+	[ALC662_5ST_DIG] = {
>+		.mixers = { alc662_base_mixer, alc662_chmode_mixer,
>+			    alc662_capture_mixer },
>+		.init_verbs = { alc662_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.dig_out_nid = ALC662_DIGOUT_NID,
>+		.dig_in_nid = ALC662_DIGIN_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc662_5stack_modes),
>+		.channel_mode = alc662_5stack_modes,
>+		.input_mux = &alc662_capture_source,
>+	},
>+	[ALC662_LENOVO_101E] = {
>+		.mixers = { alc662_lenovo_101e_mixer, alc662_capture_mixer },
>+		.init_verbs = { alc662_init_verbs, alc662_sue_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
>+		.channel_mode = alc662_3ST_2ch_modes,
>+		.input_mux = &alc662_lenovo_101e_capture_source,
>+		.unsol_event = alc662_lenovo_101e_unsol_event,
>+		.init_hook = alc662_lenovo_101e_all_automute,
>+	},
>+	[ALC662_ASUS_EEEPC_P701] = {
>+		.mixers = { alc662_eeepc_p701_mixer, alc662_capture_mixer },
>+		.init_verbs = { alc662_init_verbs,
>+				alc662_eeepc_sue_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
>+		.channel_mode = alc662_3ST_2ch_modes,
>+		.input_mux = &alc662_eeepc_capture_source,
>+		.unsol_event = alc662_eeepc_unsol_event,
>+		.init_hook = alc662_eeepc_inithook,
>+	},
>+	[ALC662_ASUS_EEEPC_EP20] = {
>+		.mixers = { alc662_eeepc_ep20_mixer, alc662_capture_mixer,
>+			    alc662_chmode_mixer },
>+		.init_verbs = { alc662_init_verbs,
>+				alc662_eeepc_ep20_sue_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),
>+		.channel_mode = alc662_3ST_6ch_modes,
>+		.input_mux = &alc662_lenovo_101e_capture_source,
>+		.unsol_event = alc662_eeepc_ep20_unsol_event,
>+		.init_hook = alc662_eeepc_ep20_inithook,
>+	},
>+	[ALC663_ASUS_M51VA] = {
>+		.mixers = { alc663_m51va_mixer, alc662_capture_mixer},
>+		.init_verbs = { alc662_init_verbs, alc663_m51va_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.dig_out_nid = ALC662_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
>+		.channel_mode = alc662_3ST_2ch_modes,
>+		.input_mux = &alc663_m51va_capture_source,
>+		.unsol_event = alc663_m51va_unsol_event,
>+		.init_hook = alc663_m51va_inithook,
>+	},
>+	[ALC663_ASUS_G71V] = {
>+		.mixers = { alc663_g71v_mixer, alc662_capture_mixer},
>+		.init_verbs = { alc662_init_verbs, alc663_g71v_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.dig_out_nid = ALC662_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
>+		.channel_mode = alc662_3ST_2ch_modes,
>+		.input_mux = &alc662_eeepc_capture_source,
>+		.unsol_event = alc663_g71v_unsol_event,
>+		.init_hook = alc663_g71v_inithook,
>+	},
>+	[ALC663_ASUS_H13] = {
>+		.mixers = { alc663_m51va_mixer, alc662_capture_mixer},
>+		.init_verbs = { alc662_init_verbs, alc663_m51va_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
>+		.channel_mode = alc662_3ST_2ch_modes,
>+		.input_mux = &alc663_m51va_capture_source,
>+		.unsol_event = alc663_m51va_unsol_event,
>+		.init_hook = alc663_m51va_inithook,
>+	},
>+	[ALC663_ASUS_G50V] = {
>+		.mixers = { alc663_g50v_mixer, alc662_capture_mixer},
>+		.init_verbs = { alc662_init_verbs, alc663_g50v_init_verbs },
>+		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
>+		.dac_nids = alc662_dac_nids,
>+		.dig_out_nid = ALC662_DIGOUT_NID,
>+		.num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),
>+		.channel_mode = alc662_3ST_6ch_modes,
>+		.input_mux = &alc663_capture_source,
>+		.unsol_event = alc663_g50v_unsol_event,
>+		.init_hook = alc663_g50v_inithook,
>+	},
>+};
>+
>+
>+/*
>+ * BIOS auto configuration
>+ */
>+
>+/* add playback controls from the parsed DAC table */
>+static int alc662_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_dac(i);
>+		if (i == 2) {
>+			/* Center/LFE */
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+					  "Center Playback Volume",
>+					  HDA_COMPOSE_AMP_VAL(nid, 1, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+			err = add_control(spec, ALC_CTL_WIDGET_VOL,
>+					  "LFE Playback Volume",
>+					  HDA_COMPOSE_AMP_VAL(nid, 2, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+			err = add_control(spec, ALC_CTL_BIND_MUTE,
>+					  "Center Playback Switch",
>+					  HDA_COMPOSE_AMP_VAL(nid, 1, 2,
>+							      HDA_INPUT));
>+			if (err < 0)
>+				return err;
>+			err = add_control(spec, ALC_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, ALC_CTL_WIDGET_VOL, name,
>+					  HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+							      HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+			sprintf(name, "%s Playback Switch", chname[i]);
>+			err = add_control(spec, ALC_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 alc662_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));
>+                /* printk("DAC nid=%x\n",nid); */
>+		/* specify the DAC as the extra output */
>+		if (!spec->multiout.hp_nid)
>+			spec->multiout.hp_nid = nid;
>+		else
>+			spec->multiout.extra_out_nid[0] = nid;
>+		/* control HP volume/switch on the output mixer amp */
>+		nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));
>+		sprintf(name, "%s Playback Volume", pfx);
>+		err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
>+				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));
>+		if (err < 0)
>+			return err;
>+		sprintf(name, "%s Playback Switch", pfx);
>+		err = add_control(spec, ALC_CTL_BIND_MUTE, name,
>+				  HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT));
>+		if (err < 0)
>+			return err;
>+	} else if (alc880_is_multi_pin(pin)) {
>+		/* set manual connection */
>+		/* we have only a switch on HP-out PIN */
>+		sprintf(name, "%s Playback Switch", pfx);
>+		err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
>+				  HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
>+		if (err < 0)
>+			return err;
>+	}
>+	return 0;
>+}
>+
>+/* create playback/capture controls for input pins */
>+static int alc662_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 alc662_auto_set_output_and_unmute(struct hda_codec *codec,
>+					      hda_nid_t nid, int pin_type,
>+					      int dac_idx)
>+{
>+	alc_set_pin_output(codec, nid, pin_type);
>+	/* 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 alc662_auto_init_multi_out(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	int i;
>+
>+	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);
>+	for (i = 0; i <= HDA_SIDE; i++) {
>+		hda_nid_t nid = spec->autocfg.line_out_pins[i];
>+		int pin_type = get_pin_type(spec->autocfg.line_out_type);
>+		if (nid)
>+			alc662_auto_set_output_and_unmute(codec, nid, pin_type,
>+							  i);
>+	}
>+}
>+
>+static void alc662_auto_init_hp_out(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	hda_nid_t pin;
>+
>+	pin = spec->autocfg.hp_pins[0];
>+	if (pin) /* connect to front */
>+		/* use dac 0 */
>+		alc662_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
>+	pin = spec->autocfg.speaker_pins[0];
>+	if (pin)
>+		alc662_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
>+}
>+
>+#define alc662_is_input_pin(nid)	alc880_is_input_pin(nid)
>+#define ALC662_PIN_CD_NID		ALC880_PIN_CD_NID
>+
>+static void alc662_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 (alc662_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 != ALC662_PIN_CD_NID)
>+				snd_hda_codec_write(codec, nid, 0,
>+						    AC_VERB_SET_AMP_GAIN_MUTE,
>+						    AMP_OUT_MUTE);
>+		}
>+	}
>+}
>+
>+static int alc662_parse_auto_config(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	int err;
>+	static hda_nid_t alc662_ignore[] = { 0x1d, 0 };
>+
>+	err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
>+					   alc662_ignore);
>+	if (err < 0)
>+		return err;
>+	if (!spec->autocfg.line_outs)
>+		return 0; /* can't find valid BIOS pin config */
>+
>+	err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc662_auto_create_multi_out_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = alc662_auto_create_extra_out(spec,
>+					   spec->autocfg.speaker_pins[0],
>+					   "Speaker");
>+	if (err < 0)
>+		return err;
>+	err = alc662_auto_create_extra_out(spec, spec->autocfg.hp_pins[0],
>+					   "Headphone");
>+	if (err < 0)
>+		return err;
>+	err = alc662_auto_create_analog_input_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+
>+	spec->multiout.max_channels = spec->multiout.num_dacs * 2;
>+
>+	if (spec->autocfg.dig_out_pin)
>+		spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
>+
>+	if (spec->kctl_alloc)
>+		spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
>+
>+	spec->num_mux_defs = 1;
>+	spec->input_mux = &spec->private_imux;
>+	
>+	spec->init_verbs[spec->num_init_verbs++] = alc662_auto_init_verbs;
>+	spec->mixers[spec->num_mixers] = alc662_capture_mixer;
>+	spec->num_mixers++;
>+	return 1;
>+}
>+
>+/* additional initialization for auto-configuration model */
>+static void alc662_auto_init(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec = codec->spec;
>+	alc662_auto_init_multi_out(codec);
>+	alc662_auto_init_hp_out(codec);
>+	alc662_auto_init_analog_input(codec);
>+	if (spec->unsol_event)
>+		alc_sku_automute(codec);
>+}
>+
>+static int patch_alc662(struct hda_codec *codec)
>+{
>+	struct alc_spec *spec;
>+	int err, board_config;
>+
>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);
>+	if (!spec)
>+		return -ENOMEM;
>+
>+	codec->spec = spec;
>+
>+	alc_fix_pll_init(codec, 0x20, 0x04, 15);
>+
>+	board_config = snd_hda_check_board_config(codec, ALC662_MODEL_LAST,
>+						  alc662_models,
>+			  	                  alc662_cfg_tbl);
>+	if (board_config < 0) {
>+		printk(KERN_INFO "hda_codec: Unknown model for ALC662, "
>+		       "trying auto-probe from BIOS...\n");
>+		board_config = ALC662_AUTO;
>+	}
>+
>+	if (board_config == ALC662_AUTO) {
>+		/* automatic parse from the BIOS config */
>+		err = alc662_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 = ALC662_3ST_2ch_DIG;
>+		}
>+	}
>+
>+	if (board_config != ALC662_AUTO)
>+		setup_preset(spec, &alc662_presets[board_config]);
>+
>+	if (codec->vendor_id == 0x10ec0663) {
>+		spec->stream_name_analog = "ALC663 Analog";
>+		spec->stream_name_digital = "ALC663 Digital";
>+	} else {
>+		spec->stream_name_analog = "ALC662 Analog";
>+		spec->stream_name_digital = "ALC662 Digital";
>+	}
>+
>+	spec->stream_analog_playback = &alc662_pcm_analog_playback;
>+	spec->stream_analog_capture = &alc662_pcm_analog_capture;
>+
>+	spec->stream_digital_playback = &alc662_pcm_digital_playback;
>+	spec->stream_digital_capture = &alc662_pcm_digital_capture;
>+
>+	spec->adc_nids = alc662_adc_nids;
>+	spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids);
>+	spec->capsrc_nids = alc662_capsrc_nids;
>+
>+	spec->vmaster_nid = 0x02;
>+
>+	codec->patch_ops = alc_patch_ops;
>+	if (board_config == ALC662_AUTO)
>+		spec->init_hook = alc662_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	if (!spec->loopback.amplist)
>+		spec->loopback.amplist = alc662_loopbacks;
>+#endif
> 
> 	return 0;
> }
>@@ -8877,15 +14640,26 @@ static int patch_alc861vd(struct hda_codec *codec)
> struct hda_codec_preset snd_hda_preset_realtek[] = {
> 	{ .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 },
> 	{ .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 },
>+	{ .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 },
>+	{ .id = 0x10ec0268, .name = "ALC268", .patch = patch_alc268 },
>+	{ .id = 0x10ec0269, .name = "ALC269", .patch = patch_alc269 },
> 	{ .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660",
>-		.patch = patch_alc861 },
>+	  .patch = patch_alc861 },
> 	{ .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd },
> 	{ .id = 0x10ec0861, .name = "ALC861", .patch = patch_alc861 },
> 	{ .id = 0x10ec0862, .name = "ALC861-VD", .patch = patch_alc861vd },
>+	{ .id = 0x10ec0662, .rev = 0x100002, .name = "ALC662 rev2",
>+	  .patch = patch_alc883 },
>+	{ .id = 0x10ec0662, .rev = 0x100101, .name = "ALC662 rev1",
>+	  .patch = patch_alc662 },
>+	{ .id = 0x10ec0663, .name = "ALC663", .patch = patch_alc662 },
> 	{ .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 },
> 	{ .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 },
> 	{ .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc883 },
>+	{ .id = 0x10ec0885, .rev = 0x100103, .name = "ALC889A",
>+	  .patch = patch_alc882 }, /* should be patch_alc883() in future */
> 	{ .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },
> 	{ .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc883 },
>+	{ .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 },
> 	{} /* terminator */
> };
>diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
>index ed5e45e..ceb3d01 100644
>--- a/sound/pci/hda/patch_si3054.c
>+++ b/sound/pci/hda/patch_si3054.c
>@@ -26,11 +26,10 @@
> #include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/slab.h>
>-#include <linux/pci.h>
> #include <sound/core.h>
> #include "hda_codec.h"
> #include "hda_local.h"
>-
>+#include "hda_patch.h"
> 
> /* si3054 verbs */
> #define SI3054_VERB_READ_NODE  0x900
>@@ -79,6 +78,8 @@
> /* si3054 codec registers (nodes) access macros */
> #define GET_REG(codec,reg) (snd_hda_codec_read(codec,reg,0,SI3054_VERB_READ_NODE,0))
> #define SET_REG(codec,reg,val) (snd_hda_codec_write(codec,reg,0,SI3054_VERB_WRITE_NODE,val))
>+#define SET_REG_CACHE(codec,reg,val) \
>+	snd_hda_codec_write_cache(codec,reg,0,SI3054_VERB_WRITE_NODE,val)
> 
> 
> struct si3054_spec {
>@@ -95,15 +96,7 @@ struct si3054_spec {
> #define PRIVATE_REG(val) ((val>>16)&0xffff)
> #define PRIVATE_MASK(val) (val&0xffff)
> 
>-static int si3054_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;
>-}
>+#define si3054_switch_info	snd_ctl_boolean_mono_info
> 
> static int si3054_switch_get(struct snd_kcontrol *kcontrol,
> 		               struct snd_ctl_elem_value *uvalue)
>@@ -122,9 +115,9 @@ static int si3054_switch_put(struct snd_kcontrol *kcontrol,
> 	u16 reg  = PRIVATE_REG(kcontrol->private_value);
> 	u16 mask = PRIVATE_MASK(kcontrol->private_value);
> 	if (uvalue->value.integer.value[0])
>-		SET_REG(codec, reg, (GET_REG(codec, reg)) | mask);
>+		SET_REG_CACHE(codec, reg, (GET_REG(codec, reg)) | mask);
> 	else
>-		SET_REG(codec, reg, (GET_REG(codec, reg)) & ~mask);
>+		SET_REG_CACHE(codec, reg, (GET_REG(codec, reg)) & ~mask);
> 	return 0;
> }
> 
>@@ -214,7 +207,7 @@ static int si3054_build_pcms(struct hda_codec *codec)
> 	info->name = "Si3054 Modem";
> 	info->stream[SNDRV_PCM_STREAM_PLAYBACK] = si3054_pcm;
> 	info->stream[SNDRV_PCM_STREAM_CAPTURE]  = si3054_pcm;
>-	info->is_modem = 1;
>+	info->pcm_type = HDA_PCM_TYPE_MODEM;
> 	return 0;
> }
> 
>@@ -276,10 +269,6 @@ static struct hda_codec_ops si3054_patch_ops = {
> 	.build_pcms = si3054_build_pcms,
> 	.init = si3054_init,
> 	.free = si3054_free,
>-#ifdef CONFIG_PM
>-	//.suspend = si3054_suspend,
>-	.resume = si3054_init,
>-#endif
> };
> 
> static int patch_si3054(struct hda_codec *codec)
>@@ -298,13 +287,18 @@ static int patch_si3054(struct hda_codec *codec)
> struct hda_codec_preset snd_hda_preset_si3054[] = {
>  	{ .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 },
>  	{ .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 },
>- 	{ .id = 0x11c11040, .name = "Si3054", .patch = patch_si3054 },
>  	{ .id = 0x11c13026, .name = "Si3054", .patch = patch_si3054 },
>  	{ .id = 0x11c13055, .name = "Si3054", .patch = patch_si3054 },
>  	{ .id = 0x11c13155, .name = "Si3054", .patch = patch_si3054 },
>  	{ .id = 0x10573055, .name = "Si3054", .patch = patch_si3054 },
>  	{ .id = 0x10573057, .name = "Si3054", .patch = patch_si3054 },
>  	{ .id = 0x10573155, .name = "Si3054", .patch = patch_si3054 },
>+	/* VIA HDA on Clevo m540 */
>+	{ .id = 0x11063288, .name = "Si3054", .patch = patch_si3054 },
>+	/* Asus A8J Modem (SM56) */
>+	{ .id = 0x15433155, .name = "Si3054", .patch = patch_si3054 },
>+	/* LG LW20 modem */
>+	{ .id = 0x18540018, .name = "Si3054", .patch = patch_si3054 },
> 	{}
> };
> 
>diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
>index 8e0e063..f713e1b 100644
>--- a/sound/pci/hda/patch_sigmatel.c
>+++ b/sound/pci/hda/patch_sigmatel.c
>@@ -33,26 +33,56 @@
> #include <sound/asoundef.h>
> #include "hda_codec.h"
> #include "hda_local.h"
>+#include "hda_patch.h"
> 
> #define NUM_CONTROL_ALLOC	32
>-#define STAC_HP_EVENT		0x37
>+#define STAC_PWR_EVENT		0x20
>+#define STAC_HP_EVENT		0x30
> 
> enum {
> 	STAC_REF,
>+	STAC_9200_OQO,
>+	STAC_9200_DELL_D21,
>+	STAC_9200_DELL_D22,
>+	STAC_9200_DELL_D23,
>+	STAC_9200_DELL_M21,
>+	STAC_9200_DELL_M22,
>+	STAC_9200_DELL_M23,
>+	STAC_9200_DELL_M24,
>+	STAC_9200_DELL_M25,
>+	STAC_9200_DELL_M26,
>+	STAC_9200_DELL_M27,
>+	STAC_9200_GATEWAY,
>+	STAC_9200_PANASONIC,
> 	STAC_9200_MODELS
> };
> 
> enum {
> 	STAC_9205_REF,
>+	STAC_9205_DELL_M42,
> 	STAC_9205_DELL_M43,
> 	STAC_9205_DELL_M44,
> 	STAC_9205_MODELS
> };
> 
> enum {
>+	STAC_92HD73XX_REF,
>+	STAC_DELL_M6,
>+	STAC_92HD73XX_MODELS
>+};
>+
>+enum {
>+	STAC_92HD71BXX_REF,
>+	STAC_DELL_M4_1,
>+	STAC_DELL_M4_2,
>+	STAC_92HD71BXX_MODELS
>+};
>+
>+enum {
> 	STAC_925x_REF,
> 	STAC_M2_2,
> 	STAC_MA6,
>+	STAC_PA6,
> 	STAC_925x_MODELS
> };
> 
>@@ -60,10 +90,22 @@ enum {
> 	STAC_D945_REF,
> 	STAC_D945GTP3,
> 	STAC_D945GTP5,
>+	STAC_INTEL_MAC_V1,
>+	STAC_INTEL_MAC_V2,
>+	STAC_INTEL_MAC_V3,
>+	STAC_INTEL_MAC_V4,
>+	STAC_INTEL_MAC_V5,
>+	/* for backward compatibility */
> 	STAC_MACMINI,
> 	STAC_MACBOOK,
> 	STAC_MACBOOK_PRO_V1,
> 	STAC_MACBOOK_PRO_V2,
>+	STAC_IMAC_INTEL,
>+	STAC_IMAC_INTEL_20,
>+	STAC_922X_DELL_D81,
>+	STAC_922X_DELL_D82,
>+	STAC_922X_DELL_M81,
>+	STAC_922X_DELL_M82,
> 	STAC_922X_MODELS
> };
> 
>@@ -71,6 +113,8 @@ enum {
> 	STAC_D965_REF,
> 	STAC_D965_3ST,
> 	STAC_D965_5ST,
>+	STAC_DELL_3ST,
>+	STAC_DELL_BIOS,
> 	STAC_927X_MODELS
> };
> 
>@@ -84,11 +128,26 @@ struct sigmatel_spec {
> 	unsigned int mic_switch: 1;
> 	unsigned int alt_switch: 1;
> 	unsigned int hp_detect: 1;
>-	unsigned int gpio_mute: 1;
> 
>-	unsigned int gpio_mask, gpio_data;
>+	/* gpio lines */
>+	unsigned int eapd_mask;
>+	unsigned int gpio_mask;
>+	unsigned int gpio_dir;
>+	unsigned int gpio_data;
>+	unsigned int gpio_mute;
>+
>+	/* analog loopback */
>+	unsigned char aloopback_mask;
>+	unsigned char aloopback_shift;
>+
>+	/* power management */
>+	unsigned int num_pwrs;
>+	hda_nid_t *pwr_nids;
>+	hda_nid_t *dac_list;
> 
> 	/* playback */
>+	struct hda_input_mux *mono_mux;
>+	unsigned int cur_mmux;
> 	struct hda_multi_out multiout;
> 	hda_nid_t dac_nids[5];
> 
>@@ -99,8 +158,10 @@ struct sigmatel_spec {
> 	unsigned int num_muxes;
> 	hda_nid_t *dmic_nids;
> 	unsigned int num_dmics;
>-	hda_nid_t dmux_nid;
>+	hda_nid_t *dmux_nids;
>+	unsigned int num_dmuxes;
> 	hda_nid_t dig_in_nid;
>+	hda_nid_t mono_nid;
> 
> 	/* pin widgets */
> 	hda_nid_t *pin_nids;
>@@ -114,12 +175,15 @@ struct sigmatel_spec {
> 
> 	/* capture source */
> 	struct hda_input_mux *dinput_mux;
>-	unsigned int cur_dmux;
>+	unsigned int cur_dmux[2];
> 	struct hda_input_mux *input_mux;
> 	unsigned int cur_mux[3];
> 
> 	/* i/o switches */
> 	unsigned int io_switch[2];
>+	unsigned int clfe_swap;
>+	unsigned int hp_switch;
>+	unsigned int aloopback;
> 
> 	struct hda_pcm pcm_rec[2];	/* PCM information */
> 
>@@ -129,6 +193,7 @@ struct sigmatel_spec {
> 	struct snd_kcontrol_new *kctl_alloc;
> 	struct hda_input_mux private_dimux;
> 	struct hda_input_mux private_imux;
>+	struct hda_input_mux private_mono_mux;
> };
> 
> static hda_nid_t stac9200_adc_nids[1] = {
>@@ -143,6 +208,58 @@ static hda_nid_t stac9200_dac_nids[1] = {
>         0x02,
> };
> 
>+static hda_nid_t stac92hd73xx_pwr_nids[8] = {
>+	0x0a, 0x0b, 0x0c, 0xd, 0x0e,
>+	0x0f, 0x10, 0x11
>+};
>+
>+static hda_nid_t stac92hd73xx_adc_nids[2] = {
>+	0x1a, 0x1b
>+};
>+
>+#define STAC92HD73XX_NUM_DMICS	2
>+static hda_nid_t stac92hd73xx_dmic_nids[STAC92HD73XX_NUM_DMICS + 1] = {
>+	0x13, 0x14, 0
>+};
>+
>+#define STAC92HD73_DAC_COUNT 5
>+static hda_nid_t stac92hd73xx_dac_nids[STAC92HD73_DAC_COUNT] = {
>+	0x15, 0x16, 0x17, 0x18, 0x19,
>+};
>+
>+static hda_nid_t stac92hd73xx_mux_nids[4] = {
>+	0x28, 0x29, 0x2a, 0x2b,
>+};
>+
>+static hda_nid_t stac92hd73xx_dmux_nids[2] = {
>+	0x20, 0x21,
>+};
>+
>+static hda_nid_t stac92hd71bxx_pwr_nids[3] = {
>+	0x0a, 0x0d, 0x0f
>+};
>+
>+static hda_nid_t stac92hd71bxx_adc_nids[2] = {
>+	0x12, 0x13,
>+};
>+
>+static hda_nid_t stac92hd71bxx_mux_nids[2] = {
>+	0x1a, 0x1b
>+};
>+
>+static hda_nid_t stac92hd71bxx_dmux_nids[1] = {
>+	0x1c,
>+};
>+
>+static hda_nid_t stac92hd71bxx_dac_nids[1] = {
>+	0x10, /*0x11, */
>+};
>+
>+#define STAC92HD71BXX_NUM_DMICS	2
>+static hda_nid_t stac92hd71bxx_dmic_nids[STAC92HD71BXX_NUM_DMICS + 1] = {
>+	0x18, 0x19, 0
>+};
>+
> static hda_nid_t stac925x_adc_nids[1] = {
>         0x03,
> };
>@@ -155,6 +272,15 @@ static hda_nid_t stac925x_dac_nids[1] = {
>         0x02,
> };
> 
>+#define STAC925X_NUM_DMICS	1
>+static hda_nid_t stac925x_dmic_nids[STAC925X_NUM_DMICS + 1] = {
>+	0x15, 0
>+};
>+
>+static hda_nid_t stac925x_dmux_nids[1] = {
>+	0x14,
>+};
>+
> static hda_nid_t stac922x_adc_nids[2] = {
>         0x06, 0x07,
> };
>@@ -171,6 +297,19 @@ static hda_nid_t stac927x_mux_nids[3] = {
>         0x15, 0x16, 0x17
> };
> 
>+static hda_nid_t stac927x_dac_nids[6] = {
>+	0x02, 0x03, 0x04, 0x05, 0x06, 0
>+};
>+
>+static hda_nid_t stac927x_dmux_nids[1] = {
>+	0x1b,
>+};
>+
>+#define STAC927X_NUM_DMICS 2
>+static hda_nid_t stac927x_dmic_nids[STAC927X_NUM_DMICS + 1] = {
>+	0x13, 0x14, 0
>+};
>+
> static hda_nid_t stac9205_adc_nids[2] = {
>         0x12, 0x13
> };
>@@ -179,7 +318,12 @@ static hda_nid_t stac9205_mux_nids[2] = {
>         0x19, 0x1a
> };
> 
>-static hda_nid_t stac9205_dmic_nids[3] = {
>+static hda_nid_t stac9205_dmux_nids[1] = {
>+	0x1d,
>+};
>+
>+#define STAC9205_NUM_DMICS	2
>+static hda_nid_t stac9205_dmic_nids[STAC9205_NUM_DMICS + 1] = {
>         0x17, 0x18, 0
> };
> 
>@@ -198,6 +342,17 @@ static hda_nid_t stac922x_pin_nids[10] = {
> 	0x0f, 0x10, 0x11, 0x15, 0x1b,
> };
> 
>+static hda_nid_t stac92hd73xx_pin_nids[13] = {
>+	0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
>+	0x0f, 0x10, 0x11, 0x12, 0x13,
>+	0x14, 0x1e, 0x22
>+};
>+
>+static hda_nid_t stac92hd71bxx_pin_nids[10] = {
>+	0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
>+	0x0f, 0x14, 0x18, 0x19, 0x1e,
>+};
>+
> static hda_nid_t stac927x_pin_nids[14] = {
> 	0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
> 	0x0f, 0x10, 0x11, 0x12, 0x13,
>@@ -223,8 +378,9 @@ static int stac92xx_dmux_enum_get(struct snd_kcontrol *kcontrol,
> {
> 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
> 	struct sigmatel_spec *spec = codec->spec;
>+	unsigned int dmux_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
> 
>-	ucontrol->value.enumerated.item[0] = spec->cur_dmux;
>+	ucontrol->value.enumerated.item[0] = spec->cur_dmux[dmux_idx];
> 	return 0;
> }
> 
>@@ -233,9 +389,10 @@ static int stac92xx_dmux_enum_put(struct snd_kcontrol *kcontrol,
> {
> 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
> 	struct sigmatel_spec *spec = codec->spec;
>+	unsigned int dmux_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
> 
> 	return snd_hda_input_mux_put(codec, spec->dinput_mux, ucontrol,
>-				     spec->dmux_nid, &spec->cur_dmux);
>+			spec->dmux_nids[dmux_idx], &spec->cur_dmux[dmux_idx]);
> }
> 
> static int stac92xx_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
>@@ -265,12 +422,239 @@ static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
> 				     spec->mux_nids[adc_idx], &spec->cur_mux[adc_idx]);
> }
> 
>+static int stac92xx_mono_mux_enum_info(struct snd_kcontrol *kcontrol,
>+	struct snd_ctl_elem_info *uinfo)
>+{
>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>+	struct sigmatel_spec *spec = codec->spec;
>+	return snd_hda_input_mux_info(spec->mono_mux, uinfo);
>+}
>+
>+static int stac92xx_mono_mux_enum_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;
>+
>+	ucontrol->value.enumerated.item[0] = spec->cur_mmux;
>+	return 0;
>+}
>+
>+static int stac92xx_mono_mux_enum_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;
>+
>+	return snd_hda_input_mux_put(codec, spec->mono_mux, ucontrol,
>+				     spec->mono_nid, &spec->cur_mmux);
>+}
>+
>+#define stac92xx_aloopback_info snd_ctl_boolean_mono_info
>+
>+static int stac92xx_aloopback_get(struct snd_kcontrol *kcontrol,
>+	struct snd_ctl_elem_value *ucontrol)
>+{
>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>+	unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
>+	struct sigmatel_spec *spec = codec->spec;
>+
>+	ucontrol->value.integer.value[0] = !!(spec->aloopback &
>+					      (spec->aloopback_mask << idx));
>+	return 0;
>+}
>+
>+static int stac92xx_aloopback_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;
>+	unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
>+	unsigned int dac_mode;
>+	unsigned int val, idx_val;
>+
>+	idx_val = spec->aloopback_mask << idx;
>+	if (ucontrol->value.integer.value[0])
>+		val = spec->aloopback | idx_val;
>+	else
>+		val = spec->aloopback & ~idx_val;
>+	if (spec->aloopback == val)
>+		return 0;
>+
>+	spec->aloopback = val;
>+
>+	/* Only return the bits defined by the shift value of the
>+	 * first two bytes of the mask
>+	 */
>+	dac_mode = snd_hda_codec_read(codec, codec->afg, 0,
>+				      kcontrol->private_value & 0xFFFF, 0x0);
>+	dac_mode >>= spec->aloopback_shift;
>+
>+	if (spec->aloopback & idx_val) {
>+		snd_hda_power_up(codec);
>+		dac_mode |= idx_val;
>+	} else {
>+		snd_hda_power_down(codec);
>+		dac_mode &= ~idx_val;
>+	}
>+
>+	snd_hda_codec_write_cache(codec, codec->afg, 0,
>+		kcontrol->private_value >> 16, dac_mode);
>+
>+	return 1;
>+}
>+
> static struct hda_verb stac9200_core_init[] = {
> 	/* set dac0mux for dac converter */
> 	{ 0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
> 	{}
> };
> 
>+static struct hda_verb stac9200_eapd_init[] = {
>+	/* set dac0mux for dac converter */
>+	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{0x08, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
>+	{}
>+};
>+
>+static struct hda_verb stac92hd73xx_6ch_core_init[] = {
>+	/* set master volume and direct control */
>+	{ 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
>+	/* setup audio connections */
>+	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x11, AC_VERB_SET_CONNECT_SEL, 0x02},
>+	/* setup adcs to point to mixer */
>+	{ 0x20, AC_VERB_SET_CONNECT_SEL, 0x0b},
>+	{ 0x21, AC_VERB_SET_CONNECT_SEL, 0x0b},
>+	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	/* setup import muxs */
>+	{ 0x28, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x29, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x2a, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x2b, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{}
>+};
>+
>+static struct hda_verb dell_eq_core_init[] = {
>+	/* set master volume to max value without distortion
>+	 * and direct control */
>+	{ 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xec},
>+	/* setup audio connections */
>+	{ 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{ 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x02},
>+	/* setup adcs to point to mixer */
>+	{ 0x20, AC_VERB_SET_CONNECT_SEL, 0x0b},
>+	{ 0x21, AC_VERB_SET_CONNECT_SEL, 0x0b},
>+	/* setup import muxs */
>+	{ 0x28, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x29, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x2a, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x2b, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{}
>+};
>+
>+static struct hda_verb dell_m6_core_init[] = {
>+	/* set master volume and direct control */
>+	{ 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
>+	/* setup audio connections */
>+	{ 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{ 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x02},
>+	/* setup adcs to point to mixer */
>+	{ 0x20, AC_VERB_SET_CONNECT_SEL, 0x0b},
>+	{ 0x21, AC_VERB_SET_CONNECT_SEL, 0x0b},
>+	/* setup import muxs */
>+	{ 0x28, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x29, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x2a, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x2b, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{}
>+};
>+
>+static struct hda_verb stac92hd73xx_8ch_core_init[] = {
>+	/* set master volume and direct control */
>+	{ 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
>+	/* setup audio connections */
>+	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00},
>+	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x11, AC_VERB_SET_CONNECT_SEL, 0x02},
>+	/* connect hp ports to dac3 */
>+	{ 0x0a, AC_VERB_SET_CONNECT_SEL, 0x03},
>+	{ 0x0d, AC_VERB_SET_CONNECT_SEL, 0x03},
>+	/* setup adcs to point to mixer */
>+	{ 0x20, AC_VERB_SET_CONNECT_SEL, 0x0b},
>+	{ 0x21, AC_VERB_SET_CONNECT_SEL, 0x0b},
>+	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	/* setup import muxs */
>+	{ 0x28, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x29, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x2a, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x2b, AC_VERB_SET_CONNECT_SEL, 0x03},
>+	{}
>+};
>+
>+static struct hda_verb stac92hd73xx_10ch_core_init[] = {
>+	/* set master volume and direct control */
>+	{ 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
>+	/* setup audio connections */
>+	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
>+	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x01 },
>+	{ 0x11, AC_VERB_SET_CONNECT_SEL, 0x02 },
>+	/* dac3 is connected to import3 mux */
>+	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb07f},
>+	/* connect hp ports to dac4 */
>+	{ 0x0a, AC_VERB_SET_CONNECT_SEL, 0x04},
>+	{ 0x0d, AC_VERB_SET_CONNECT_SEL, 0x04},
>+	/* setup adcs to point to mixer */
>+	{ 0x20, AC_VERB_SET_CONNECT_SEL, 0x0b},
>+	{ 0x21, AC_VERB_SET_CONNECT_SEL, 0x0b},
>+	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
>+	/* setup import muxs */
>+	{ 0x28, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x29, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x2a, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x2b, AC_VERB_SET_CONNECT_SEL, 0x03},
>+	{}
>+};
>+
>+static struct hda_verb stac92hd71bxx_core_init[] = {
>+	/* set master volume and direct control */
>+	{ 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
>+	/* connect headphone jack to dac1 */
>+	{ 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Speaker */
>+	/* unmute right and left channels for nodes 0x0a, 0xd, 0x0f */
>+	{ 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{ 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+};
>+
>+static struct hda_verb stac92hd71bxx_analog_core_init[] = {
>+	/* set master volume and direct control */
>+	{ 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
>+	/* connect headphone jack to dac1 */
>+	{ 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01},
>+	/* connect ports 0d and 0f to audio mixer */
>+	{ 0x0d, AC_VERB_SET_CONNECT_SEL, 0x2},
>+	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2},
>+	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Speaker */
>+	/* unmute dac0 input in audio mixer */
>+	{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0x701f},
>+	/* unmute right and left channels for nodes 0x0a, 0xd, 0x0f */
>+	{ 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{ 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{}
>+};
>+
> static struct hda_verb stac925x_core_init[] = {
> 	/* set dac0mux for dac converter */
> 	{ 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},
>@@ -305,107 +689,246 @@ static struct hda_verb stac9205_core_init[] = {
> 	{}
> };
> 
>+#define STAC_MONO_MUX \
>+	{ \
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
>+		.name = "Mono Mux", \
>+		.count = 1, \
>+		.info = stac92xx_mono_mux_enum_info, \
>+		.get = stac92xx_mono_mux_enum_get, \
>+		.put = stac92xx_mono_mux_enum_put, \
>+	}
>+
>+#define STAC_INPUT_SOURCE(cnt) \
>+	{ \
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
>+		.name = "Input Source", \
>+		.count = cnt, \
>+		.info = stac92xx_mux_enum_info, \
>+		.get = stac92xx_mux_enum_get, \
>+		.put = stac92xx_mux_enum_put, \
>+	}
>+
>+#define STAC_ANALOG_LOOPBACK(verb_read, verb_write, cnt) \
>+	{ \
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
>+		.name  = "Analog Loopback", \
>+		.count = cnt, \
>+		.info  = stac92xx_aloopback_info, \
>+		.get   = stac92xx_aloopback_get, \
>+		.put   = stac92xx_aloopback_put, \
>+		.private_value = verb_read | (verb_write << 16), \
>+	}
>+
> 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,
>-		.name = "Input Source",
>-		.count = 1,
>-		.info = stac92xx_mux_enum_info,
>-		.get = stac92xx_mux_enum_get,
>-		.put = stac92xx_mux_enum_put,
>-	},
>+	STAC_INPUT_SOURCE(1),
> 	HDA_CODEC_VOLUME("Capture Volume", 0x0a, 0, HDA_OUTPUT),
> 	HDA_CODEC_MUTE("Capture Switch", 0x0a, 0, HDA_OUTPUT),
> 	HDA_CODEC_VOLUME("Capture Mux Volume", 0x0c, 0, HDA_OUTPUT),
> 	{ } /* end */
> };
> 
>+static struct snd_kcontrol_new stac92hd73xx_6ch_mixer[] = {
>+	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 3),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x20, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x20, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x21, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME("Front Mic Mixer Capture Volume", 0x1d, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Front Mic Mixer Capture Switch", 0x1d, 0, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("Mic Mixer Capture Volume", 0x1d, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Mixer Capture Switch", 0x1d, 0x1, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("Line In Mixer Capture Volume", 0x1d, 0x2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line In Mixer Capture Switch", 0x1d, 0x2, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("DAC Mixer Capture Volume", 0x1d, 0x3, HDA_INPUT),
>+	HDA_CODEC_MUTE("DAC Mixer Capture Switch", 0x1d, 0x3, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("CD Mixer Capture Volume", 0x1d, 0x4, HDA_INPUT),
>+	HDA_CODEC_MUTE("CD Mixer Capture Switch", 0x1d, 0x4, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new stac92hd73xx_8ch_mixer[] = {
>+	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 4),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x20, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x20, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x21, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME("Front Mic Mixer Capture Volume", 0x1d, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Front Mic Mixer Capture Switch", 0x1d, 0, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("Mic Mixer Capture Volume", 0x1d, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Mixer Capture Switch", 0x1d, 0x1, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("Line In Mixer Capture Volume", 0x1d, 0x2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line In Mixer Capture Switch", 0x1d, 0x2, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("DAC Mixer Capture Volume", 0x1d, 0x3, HDA_INPUT),
>+	HDA_CODEC_MUTE("DAC Mixer Capture Switch", 0x1d, 0x3, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("CD Mixer Capture Volume", 0x1d, 0x4, HDA_INPUT),
>+	HDA_CODEC_MUTE("CD Mixer Capture Switch", 0x1d, 0x4, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new stac92hd73xx_10ch_mixer[] = {
>+	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 5),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x20, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x20, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x21, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x21, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME("Front Mic Mixer Capture Volume", 0x1d, 0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Front Mic Mixer Capture Switch", 0x1d, 0, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("Mic Mixer Capture Volume", 0x1d, 0x1, HDA_INPUT),
>+	HDA_CODEC_MUTE("Mic Mixer Capture Switch", 0x1d, 0x1, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("Line In Mixer Capture Volume", 0x1d, 0x2, HDA_INPUT),
>+	HDA_CODEC_MUTE("Line In Mixer Capture Switch", 0x1d, 0x2, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("DAC Mixer Capture Volume", 0x1d, 0x3, HDA_INPUT),
>+	HDA_CODEC_MUTE("DAC Mixer Capture Switch", 0x1d, 0x3, HDA_INPUT),
>+
>+	HDA_CODEC_VOLUME("CD Mixer Capture Volume", 0x1d, 0x4, HDA_INPUT),
>+	HDA_CODEC_MUTE("CD Mixer Capture Switch", 0x1d, 0x4, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = {
>+	STAC_INPUT_SOURCE(2),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_IDX("Capture Mux Volume", 0x0, 0x1a, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x1d, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1d, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_IDX("Capture Mux Volume", 0x1, 0x1b, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_MUTE("Analog Loopback 1", 0x17, 0x3, HDA_INPUT),
>+	HDA_CODEC_MUTE("Analog Loopback 2", 0x17, 0x4, HDA_INPUT),
>+	{ } /* end */
>+};
>+
>+static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {
>+	STAC_INPUT_SOURCE(2),
>+	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_IDX("Capture Mux Volume", 0x0, 0x1a, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x1d, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1d, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_IDX("Capture Mux Volume", 0x1, 0x1b, 0x0, HDA_OUTPUT),
>+	{ } /* end */
>+};
>+
> static struct snd_kcontrol_new stac925x_mixer[] = {
>-	HDA_CODEC_VOLUME("Master Playback Volume", 0xe, 0, HDA_OUTPUT),
>-	HDA_CODEC_MUTE("Master Playback Switch", 0xe, 0, HDA_OUTPUT),
>-	{
>-		.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,
>-	},
>+	STAC_INPUT_SOURCE(1),
> 	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_OUTPUT),
>-	HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_OUTPUT),
>+	HDA_CODEC_MUTE("Capture Switch", 0x14, 0, HDA_OUTPUT),
> 	HDA_CODEC_VOLUME("Capture Mux Volume", 0x0f, 0, HDA_OUTPUT),
> 	{ } /* end */
> };
> 
>-/* This needs to be generated dynamically based on sequence */
>-static struct snd_kcontrol_new stac922x_mixer[] = {
>-	{
>-		.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),
>-	HDA_CODEC_MUTE("Capture Switch", 0x17, 0x0, HDA_INPUT),
>-	HDA_CODEC_VOLUME("Mux Capture Volume", 0x12, 0x0, HDA_OUTPUT),
>+static struct snd_kcontrol_new stac9205_mixer[] = {
>+	STAC_INPUT_SOURCE(2),
>+	STAC_ANALOG_LOOPBACK(0xFE0, 0x7E0, 1),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1b, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1d, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x0, 0x19, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x1c, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1e, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x1, 0x1A, 0x0, HDA_OUTPUT),
>+
> 	{ } /* end */
> };
> 
> /* This needs to be generated dynamically based on sequence */
>-static struct snd_kcontrol_new stac9227_mixer[] = {
>-	{
>-		.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", 0x15, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_MUTE("Capture Switch", 0x1b, 0x0, HDA_OUTPUT),
>+static struct snd_kcontrol_new stac922x_mixer[] = {
>+	STAC_INPUT_SOURCE(2),
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x17, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x17, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x0, 0x12, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x18, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x18, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x1, 0x13, 0x0, HDA_OUTPUT),
> 	{ } /* end */
> };
> 
>+
> static struct snd_kcontrol_new stac927x_mixer[] = {
>-	{
>-		.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("InMux Capture Volume", 0x15, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_VOLUME("InVol Capture Volume", 0x18, 0x0, HDA_INPUT),
>-	HDA_CODEC_MUTE("ADCMux Capture Switch", 0x1b, 0x0, HDA_OUTPUT),
>+	STAC_INPUT_SOURCE(3),
>+	STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB, 1),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x18, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1b, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x0, 0x15, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x19, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1c, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x1, 0x16, 0x0, HDA_OUTPUT),
>+
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x2, 0x1A, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 0x2, 0x1d, 0x0, HDA_OUTPUT),
>+	HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x2, 0x17, 0x0, HDA_OUTPUT),
> 	{ } /* end */
> };
> 
>-static struct snd_kcontrol_new stac9205_mixer[] = {
>-	{
>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Digital Input Source",
>-		.count = 1,
>-		.info = stac92xx_dmux_enum_info,
>-		.get = stac92xx_dmux_enum_get,
>-		.put = stac92xx_dmux_enum_put,
>-	},
>-	{
>-		.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("InMux Capture Volume", 0x19, 0x0, HDA_OUTPUT),
>-	HDA_CODEC_VOLUME("InVol Capture Volume", 0x1b, 0x0, HDA_INPUT),
>-	HDA_CODEC_MUTE("ADCMux Capture Switch", 0x1d, 0x0, HDA_OUTPUT),
>-	{ } /* end */
>+static struct snd_kcontrol_new stac_dmux_mixer = {
>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+	.name = "Digital Input Source",
>+	/* count set later */
>+	.info = stac92xx_dmux_enum_info,
>+	.get = stac92xx_dmux_enum_get,
>+	.put = stac92xx_dmux_enum_put,
>+};
>+
>+static const char *slave_vols[] = {
>+	"Front Playback Volume",
>+	"Surround Playback Volume",
>+	"Center Playback Volume",
>+	"LFE Playback Volume",
>+	"Side Playback Volume",
>+	"Headphone Playback Volume",
>+	"Headphone Playback Volume",
>+	"Speaker Playback Volume",
>+	"External Speaker Playback Volume",
>+	"Speaker2 Playback Volume",
>+	NULL
>+};
>+
>+static const char *slave_sws[] = {
>+	"Front Playback Switch",
>+	"Surround Playback Switch",
>+	"Center Playback Switch",
>+	"LFE Playback Switch",
>+	"Side Playback Switch",
>+	"Headphone Playback Switch",
>+	"Headphone Playback Switch",
>+	"Speaker Playback Switch",
>+	"External Speaker Playback Switch",
>+	"Speaker2 Playback Switch",
>+	"IEC958 Playback Switch",
>+	NULL
> };
> 
> static int stac92xx_build_controls(struct hda_codec *codec)
>@@ -423,17 +946,47 @@ static int stac92xx_build_controls(struct hda_codec *codec)
> 		if (err < 0)
> 			return err;
> 	}
>+	if (spec->num_dmuxes > 0) {
>+		stac_dmux_mixer.count = spec->num_dmuxes;
>+		err = snd_ctl_add(codec->bus->card,
>+				  snd_ctl_new1(&stac_dmux_mixer, codec));
>+		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;
>+		err = snd_hda_create_spdif_share_sw(codec,
>+						    &spec->multiout);
>+		if (err < 0)
>+			return err;
>+		spec->multiout.share_spdif = 1;
> 	}
> 	if (spec->dig_in_nid) {
> 		err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
> 		if (err < 0)
> 			return err;
> 	}
>+
>+	/* if we have no master control, let's create it */
>+	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
>+		unsigned int vmaster_tlv[4];
>+		snd_hda_set_vmaster_tlv(codec, spec->multiout.dac_nids[0],
>+					HDA_OUTPUT, vmaster_tlv);
>+		err = snd_hda_add_vmaster(codec, "Master Playback Volume",
>+					  vmaster_tlv, slave_vols);
>+		if (err < 0)
>+			return err;
>+	}
>+	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {
>+		err = snd_hda_add_vmaster(codec, "Master Playback Switch",
>+					  NULL, slave_sws);
>+		if (err < 0)
>+			return err;
>+	}
>+
> 	return 0;	
> }
> 
>@@ -442,12 +995,154 @@ static unsigned int ref9200_pin_configs[8] = {
> 	0x02a19020, 0x01a19021, 0x90100140, 0x01813122,
> };
> 
>+/* 
>+    STAC 9200 pin configs for
>+    102801A8
>+    102801DE
>+    102801E8
>+*/
>+static unsigned int dell9200_d21_pin_configs[8] = {
>+	0x400001f0, 0x400001f1, 0x02214030, 0x01014010, 
>+	0x02a19020, 0x01a19021, 0x90100140, 0x01813122,
>+};
>+
>+/* 
>+    STAC 9200 pin configs for
>+    102801C0
>+    102801C1
>+*/
>+static unsigned int dell9200_d22_pin_configs[8] = {
>+	0x400001f0, 0x400001f1, 0x0221401f, 0x01014010, 
>+	0x01813020, 0x02a19021, 0x90100140, 0x400001f2,
>+};
>+
>+/* 
>+    STAC 9200 pin configs for
>+    102801C4 (Dell Dimension E310)
>+    102801C5
>+    102801C7
>+    102801D9
>+    102801DA
>+    102801E3
>+*/
>+static unsigned int dell9200_d23_pin_configs[8] = {
>+	0x400001f0, 0x400001f1, 0x0221401f, 0x01014010, 
>+	0x01813020, 0x01a19021, 0x90100140, 0x400001f2, 
>+};
>+
>+
>+/* 
>+    STAC 9200-32 pin configs for
>+    102801B5 (Dell Inspiron 630m)
>+    102801D8 (Dell Inspiron 640m)
>+*/
>+static unsigned int dell9200_m21_pin_configs[8] = {
>+	0x40c003fa, 0x03441340, 0x0321121f, 0x90170310,
>+	0x408003fb, 0x03a11020, 0x401003fc, 0x403003fd,
>+};
>+
>+/* 
>+    STAC 9200-32 pin configs for
>+    102801C2 (Dell Latitude D620)
>+    102801C8 
>+    102801CC (Dell Latitude D820)
>+    102801D4 
>+    102801D6 
>+*/
>+static unsigned int dell9200_m22_pin_configs[8] = {
>+	0x40c003fa, 0x0144131f, 0x0321121f, 0x90170310, 
>+	0x90a70321, 0x03a11020, 0x401003fb, 0x40f000fc,
>+};
>+
>+/* 
>+    STAC 9200-32 pin configs for
>+    102801CE (Dell XPS M1710)
>+    102801CF (Dell Precision M90)
>+*/
>+static unsigned int dell9200_m23_pin_configs[8] = {
>+	0x40c003fa, 0x01441340, 0x0421421f, 0x90170310,
>+	0x408003fb, 0x04a1102e, 0x90170311, 0x403003fc,
>+};
>+
>+/*
>+    STAC 9200-32 pin configs for 
>+    102801C9
>+    102801CA
>+    102801CB (Dell Latitude 120L)
>+    102801D3
>+*/
>+static unsigned int dell9200_m24_pin_configs[8] = {
>+	0x40c003fa, 0x404003fb, 0x0321121f, 0x90170310, 
>+	0x408003fc, 0x03a11020, 0x401003fd, 0x403003fe, 
>+};
>+
>+/*
>+    STAC 9200-32 pin configs for
>+    102801BD (Dell Inspiron E1505n)
>+    102801EE
>+    102801EF
>+*/
>+static unsigned int dell9200_m25_pin_configs[8] = {
>+	0x40c003fa, 0x01441340, 0x0421121f, 0x90170310, 
>+	0x408003fb, 0x04a11020, 0x401003fc, 0x403003fd,
>+};
>+
>+/*
>+    STAC 9200-32 pin configs for
>+    102801F5 (Dell Inspiron 1501)
>+    102801F6
>+*/
>+static unsigned int dell9200_m26_pin_configs[8] = {
>+	0x40c003fa, 0x404003fb, 0x0421121f, 0x90170310, 
>+	0x408003fc, 0x04a11020, 0x401003fd, 0x403003fe,
>+};
>+
>+/*
>+    STAC 9200-32
>+    102801CD (Dell Inspiron E1705/9400)
>+*/
>+static unsigned int dell9200_m27_pin_configs[8] = {
>+	0x40c003fa, 0x01441340, 0x0421121f, 0x90170310,
>+	0x90170310, 0x04a11020, 0x90170310, 0x40f003fc,
>+};
>+
>+static unsigned int oqo9200_pin_configs[8] = {
>+	0x40c000f0, 0x404000f1, 0x0221121f, 0x02211210,
>+	0x90170111, 0x90a70120, 0x400000f2, 0x400000f3,
>+};
>+
>+
> static unsigned int *stac9200_brd_tbl[STAC_9200_MODELS] = {
> 	[STAC_REF] = ref9200_pin_configs,
>+	[STAC_9200_OQO] = oqo9200_pin_configs,
>+	[STAC_9200_DELL_D21] = dell9200_d21_pin_configs,
>+	[STAC_9200_DELL_D22] = dell9200_d22_pin_configs,
>+	[STAC_9200_DELL_D23] = dell9200_d23_pin_configs,
>+	[STAC_9200_DELL_M21] = dell9200_m21_pin_configs,
>+	[STAC_9200_DELL_M22] = dell9200_m22_pin_configs,
>+	[STAC_9200_DELL_M23] = dell9200_m23_pin_configs,
>+	[STAC_9200_DELL_M24] = dell9200_m24_pin_configs,
>+	[STAC_9200_DELL_M25] = dell9200_m25_pin_configs,
>+	[STAC_9200_DELL_M26] = dell9200_m26_pin_configs,
>+	[STAC_9200_DELL_M27] = dell9200_m27_pin_configs,
>+	[STAC_9200_PANASONIC] = ref9200_pin_configs,
> };
> 
> static const char *stac9200_models[STAC_9200_MODELS] = {
> 	[STAC_REF] = "ref",
>+	[STAC_9200_OQO] = "oqo",
>+	[STAC_9200_DELL_D21] = "dell-d21",
>+	[STAC_9200_DELL_D22] = "dell-d22",
>+	[STAC_9200_DELL_D23] = "dell-d23",
>+	[STAC_9200_DELL_M21] = "dell-m21",
>+	[STAC_9200_DELL_M22] = "dell-m22",
>+	[STAC_9200_DELL_M23] = "dell-m23",
>+	[STAC_9200_DELL_M24] = "dell-m24",
>+	[STAC_9200_DELL_M25] = "dell-m25",
>+	[STAC_9200_DELL_M26] = "dell-m26",
>+	[STAC_9200_DELL_M27] = "dell-m27",
>+	[STAC_9200_GATEWAY] = "gateway",
>+	[STAC_9200_PANASONIC] = "panasonic",
> };
> 
> static struct snd_pci_quirk stac9200_cfg_tbl[] = {
>@@ -455,26 +1150,80 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = {
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
> 		      "DFI LanParty", STAC_REF),
> 	/* Dell laptops have BIOS problem */
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a8,
>+		      "unknown Dell", STAC_9200_DELL_D21),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01b5,
>-		      "Dell Inspiron 630m", STAC_REF),
>+		      "Dell Inspiron 630m", STAC_9200_DELL_M21),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01bd,
>+		      "Dell Inspiron E1505n", STAC_9200_DELL_M25),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c0,
>+		      "unknown Dell", STAC_9200_DELL_D22),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c1,
>+		      "unknown Dell", STAC_9200_DELL_D22),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c2,
>-		      "Dell Latitude D620", STAC_REF),
>+		      "Dell Latitude D620", STAC_9200_DELL_M22),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c5,
>+		      "unknown Dell", STAC_9200_DELL_D23),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c7,
>+		      "unknown Dell", STAC_9200_DELL_D23),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c8,
>+		      "unknown Dell", STAC_9200_DELL_M22),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c9,
>+		      "unknown Dell", STAC_9200_DELL_M24),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ca,
>+		      "unknown Dell", STAC_9200_DELL_M24),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cb,
>-		      "Dell Latitude 120L", STAC_REF),
>+		      "Dell Latitude 120L", STAC_9200_DELL_M24),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cc,
>-		      "Dell Latitude D820", STAC_REF),
>+		      "Dell Latitude D820", STAC_9200_DELL_M22),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cd,
>-		      "Dell Inspiron E1705/9400", STAC_REF),
>+		      "Dell Inspiron E1705/9400", STAC_9200_DELL_M27),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ce,
>-		      "Dell XPS M1710", STAC_REF),
>+		      "Dell XPS M1710", STAC_9200_DELL_M23),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cf,
>-		      "Dell Precision M90", STAC_REF),
>+		      "Dell Precision M90", STAC_9200_DELL_M23),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d3,
>+		      "unknown Dell", STAC_9200_DELL_M22),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d4,
>+		      "unknown Dell", STAC_9200_DELL_M22),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d6,
>+		      "unknown Dell", STAC_9200_DELL_M22),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d8,
>+		      "Dell Inspiron 640m", STAC_9200_DELL_M21),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d9,
>+		      "unknown Dell", STAC_9200_DELL_D23),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01da,
>+		      "unknown Dell", STAC_9200_DELL_D23),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01de,
>+		      "unknown Dell", STAC_9200_DELL_D21),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01e3,
>+		      "unknown Dell", STAC_9200_DELL_D23),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01e8,
>+		      "unknown Dell", STAC_9200_DELL_D21),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ee,
>+		      "unknown Dell", STAC_9200_DELL_M25),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ef,
>+		      "unknown Dell", STAC_9200_DELL_M25),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f5,
>+		      "Dell Inspiron 1501", STAC_9200_DELL_M26),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f6,
>+		      "unknown Dell", STAC_9200_DELL_M26),
>+	/* Panasonic */
>+	SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-74", STAC_9200_PANASONIC),
>+	/* Gateway machines needs EAPD to be set on resume */
>+	SND_PCI_QUIRK(0x107b, 0x0205, "Gateway S-7110M", STAC_9200_GATEWAY),
>+	SND_PCI_QUIRK(0x107b, 0x0317, "Gateway MT3423, MX341*",
>+		      STAC_9200_GATEWAY),
>+	SND_PCI_QUIRK(0x107b, 0x0318, "Gateway ML3019, MT3707",
>+		      STAC_9200_GATEWAY),
>+	/* OQO Mobile */
>+	SND_PCI_QUIRK(0x1106, 0x3288, "OQO Model 2", STAC_9200_OQO),
> 	{} /* terminator */
> };
> 
> static unsigned int ref925x_pin_configs[8] = {
> 	0x40c003f0, 0x424503f2, 0x01813022, 0x02a19021,
>-	0x90a70320, 0x02214210, 0x400003f1, 0x9033032e,
>+	0x90a70320, 0x02214210, 0x01019020, 0x9033032e,
> };
> 
> static unsigned int stac925x_MA6_pin_configs[8] = {
>@@ -482,39 +1231,197 @@ static unsigned int stac925x_MA6_pin_configs[8] = {
> 	0x90a70320, 0x90100211, 0x400003f1, 0x9033032e,
> };
> 
>+static unsigned int stac925x_PA6_pin_configs[8] = {
>+	0x40c003f0, 0x424503f2, 0x01813022, 0x02a19021,
>+	0x50a103f0, 0x90100211, 0x400003f1, 0x9033032e,
>+};
>+
> static unsigned int stac925xM2_2_pin_configs[8] = {
>-	0x40c003f3, 0x424503f2, 0x041800f4, 0x02a19020,
>-	0x50a103F0, 0x90100210, 0x400003f1, 0x9033032e,
>+	0x40c003f3, 0x424503f2, 0x04180011, 0x02a19020,
>+	0x50a103f0, 0x90100212, 0x400003f1, 0x9033032e,
> };
> 
> static unsigned int *stac925x_brd_tbl[STAC_925x_MODELS] = {
> 	[STAC_REF] = ref925x_pin_configs,
> 	[STAC_M2_2] = stac925xM2_2_pin_configs,
> 	[STAC_MA6] = stac925x_MA6_pin_configs,
>+	[STAC_PA6] = stac925x_PA6_pin_configs,
> };
> 
> static const char *stac925x_models[STAC_925x_MODELS] = {
> 	[STAC_REF] = "ref",
> 	[STAC_M2_2] = "m2-2",
> 	[STAC_MA6] = "m6",
>+	[STAC_PA6] = "pa6",
> };
> 
> static struct snd_pci_quirk stac925x_cfg_tbl[] = {
> 	/* SigmaTel reference board */
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, "DFI LanParty", STAC_REF),
>+	SND_PCI_QUIRK(0x8384, 0x7632, "Stac9202 Reference Board", STAC_REF),
> 	SND_PCI_QUIRK(0x107b, 0x0316, "Gateway M255", STAC_REF),
> 	SND_PCI_QUIRK(0x107b, 0x0366, "Gateway MP6954", STAC_REF),
> 	SND_PCI_QUIRK(0x107b, 0x0461, "Gateway NX560XL", STAC_MA6),
>+	SND_PCI_QUIRK(0x107b, 0x0681, "Gateway NX860", STAC_PA6),
> 	SND_PCI_QUIRK(0x1002, 0x437b, "Gateway MX6453", STAC_M2_2),
> 	{} /* terminator */
> };
> 
>+static unsigned int ref92hd73xx_pin_configs[13] = {
>+	0x02214030, 0x02a19040, 0x01a19020, 0x02214030,
>+	0x0181302e, 0x01014010, 0x01014020, 0x01014030,
>+	0x02319040, 0x90a000f0, 0x90a000f0, 0x01452050,
>+	0x01452050,
>+};
>+
>+static unsigned int dell_m6_pin_configs[13] = {
>+	0x0321101f, 0x4f00000f, 0x4f0000f0, 0x90170110,
>+	0x03a11020, 0x0321101f, 0x4f0000f0, 0x4f0000f0,
>+	0x4f0000f0, 0x90a60160, 0x4f0000f0, 0x4f0000f0,
>+	0x4f0000f0,
>+};
>+
>+static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
>+	[STAC_92HD73XX_REF]	= ref92hd73xx_pin_configs,
>+	[STAC_DELL_M6]	= dell_m6_pin_configs,
>+};
>+
>+static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
>+	[STAC_92HD73XX_REF] = "ref",
>+	[STAC_DELL_M6] = "dell-m6",
>+};
>+
>+static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
>+	/* SigmaTel reference board */
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
>+				"DFI LanParty", STAC_92HD73XX_REF),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254,
>+				"unknown Dell", STAC_DELL_M6),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255,
>+				"unknown Dell", STAC_DELL_M6),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0256,
>+				"unknown Dell", STAC_DELL_M6),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0257,
>+				"unknown Dell", STAC_DELL_M6),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025e,
>+				"unknown Dell", STAC_DELL_M6),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025f,
>+				"unknown Dell", STAC_DELL_M6),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0271,
>+				"unknown Dell", STAC_DELL_M6),
>+	{} /* terminator */
>+};
>+
>+static unsigned int ref92hd71bxx_pin_configs[10] = {
>+	0x02214030, 0x02a19040, 0x01a19020, 0x01014010,
>+	0x0181302e, 0x01114010, 0x01019020, 0x90a000f0,
>+	0x90a000f0, 0x01452050,
>+};
>+
>+static unsigned int dell_m4_1_pin_configs[13] = {
>+	0x0421101f, 0x04a11221, 0x40f000f0, 0x90170110,
>+	0x23a1902e, 0x23014250, 0x40f000f0, 0x90a000f0,
>+	0x40f000f0, 0x4f0000f0,
>+};
>+
>+static unsigned int dell_m4_2_pin_configs[13] = {
>+	0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,
>+	0x23a1902e, 0x23014250, 0x40f000f0, 0x40f000f0,
>+	0x40f000f0, 0x044413b0,
>+};
>+
>+static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
>+	[STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs,
>+	[STAC_DELL_M4_1]	= dell_m4_1_pin_configs,
>+	[STAC_DELL_M4_2]	= dell_m4_2_pin_configs,
>+};
>+
>+static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {
>+	[STAC_92HD71BXX_REF] = "ref",
>+	[STAC_DELL_M4_1] = "dell-m4-1",
>+	[STAC_DELL_M4_2] = "dell-m4-2",
>+};
>+
>+static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
>+	/* SigmaTel reference board */
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
>+		      "DFI LanParty", STAC_92HD71BXX_REF),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
>+				"unknown Dell", STAC_DELL_M4_1),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0234,
>+				"unknown Dell", STAC_DELL_M4_1),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0250,
>+				"unknown Dell", STAC_DELL_M4_1),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x024f,
>+				"unknown Dell", STAC_DELL_M4_1),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x024d,
>+				"unknown Dell", STAC_DELL_M4_1),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0251,
>+				"unknown Dell", STAC_DELL_M4_1),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0277,
>+				"unknown Dell", STAC_DELL_M4_1),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0263,
>+				"unknown Dell", STAC_DELL_M4_2),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0265,
>+				"unknown Dell", STAC_DELL_M4_2),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0262,
>+				"unknown Dell", STAC_DELL_M4_2),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0264,
>+				"unknown Dell", STAC_DELL_M4_2),
>+	{} /* terminator */
>+};
>+
> static unsigned int ref922x_pin_configs[10] = {
> 	0x01014010, 0x01016011, 0x01012012, 0x0221401f,
> 	0x01813122, 0x01011014, 0x01441030, 0x01c41030,
> 	0x40000100, 0x40000100,
> };
> 
>+/*
>+    STAC 922X pin configs for
>+    102801A7
>+    102801AB
>+    102801A9
>+    102801D1
>+    102801D2
>+*/
>+static unsigned int dell_922x_d81_pin_configs[10] = {
>+	0x02214030, 0x01a19021, 0x01111012, 0x01114010,
>+	0x02a19020, 0x01117011, 0x400001f0, 0x400001f1,
>+	0x01813122, 0x400001f2,
>+};
>+
>+/*
>+    STAC 922X pin configs for
>+    102801AC
>+    102801D0
>+*/
>+static unsigned int dell_922x_d82_pin_configs[10] = {
>+	0x02214030, 0x01a19021, 0x01111012, 0x01114010,
>+	0x02a19020, 0x01117011, 0x01451140, 0x400001f0,
>+	0x01813122, 0x400001f1,
>+};
>+
>+/*
>+    STAC 922X pin configs for
>+    102801BF
>+*/
>+static unsigned int dell_922x_m81_pin_configs[10] = {
>+	0x0321101f, 0x01112024, 0x01111222, 0x91174220,
>+	0x03a11050, 0x01116221, 0x90a70330, 0x01452340, 
>+	0x40C003f1, 0x405003f0,
>+};
>+
>+/*
>+    STAC 9221 A1 pin configs for
>+    102801D7 (Dell XPS M1210)
>+*/
>+static unsigned int dell_922x_m82_pin_configs[10] = {
>+	0x02211211, 0x408103ff, 0x02a1123e, 0x90100310, 
>+	0x408003f1, 0x0221121f, 0x03451340, 0x40c003f2, 
>+	0x508003f3, 0x405003f4, 
>+};
>+
> static unsigned int d945gtp3_pin_configs[10] = {
> 	0x0221401f, 0x01a19022, 0x01813021, 0x01014010,
> 	0x40000100, 0x40000100, 0x40000100, 0x40000100,
>@@ -527,42 +1434,79 @@ static unsigned int d945gtp5_pin_configs[10] = {
> 	0x02a19320, 0x40000100,
> };
> 
>-static unsigned int macbook_pin_configs[10] = {
>-	0x0321e230, 0x03a1e020, 0x400000fd, 0x9017e110,
>-	0x400000fe, 0x0381e021, 0x1345e240, 0x13c5e22e,
>+static unsigned int intel_mac_v1_pin_configs[10] = {
>+	0x0121e21f, 0x400000ff, 0x9017e110, 0x400000fd,
>+	0x400000fe, 0x0181e020, 0x1145e030, 0x11c5e240,
> 	0x400000fc, 0x400000fb,
> };
> 
>-static unsigned int macbook_pro_v1_pin_configs[10] = {
>-	0x0321e230, 0x03a1e020, 0x9017e110, 0x01014010,
>-	0x01a19021, 0x0381e021, 0x1345e240, 0x13c5e22e,
>-	0x02a19320, 0x400000fb
>+static unsigned int intel_mac_v2_pin_configs[10] = {
>+	0x0121e21f, 0x90a7012e, 0x9017e110, 0x400000fd,
>+	0x400000fe, 0x0181e020, 0x1145e230, 0x500000fa,
>+	0x400000fc, 0x400000fb,
>+};
>+
>+static unsigned int intel_mac_v3_pin_configs[10] = {
>+	0x0121e21f, 0x90a7012e, 0x9017e110, 0x400000fd,
>+	0x400000fe, 0x0181e020, 0x1145e230, 0x11c5e240,
>+	0x400000fc, 0x400000fb,
>+};
>+
>+static unsigned int intel_mac_v4_pin_configs[10] = {
>+	0x0321e21f, 0x03a1e02e, 0x9017e110, 0x9017e11f,
>+	0x400000fe, 0x0381e020, 0x1345e230, 0x13c5e240,
>+	0x400000fc, 0x400000fb,
> };
> 
>-static unsigned int macbook_pro_v2_pin_configs[10] = {
>-	0x0221401f, 0x90a70120, 0x01813024, 0x01014010,
>-	0x400000fd, 0x01016011, 0x1345e240, 0x13c5e22e,
>+static unsigned int intel_mac_v5_pin_configs[10] = {
>+	0x0321e21f, 0x03a1e02e, 0x9017e110, 0x9017e11f,
>+	0x400000fe, 0x0381e020, 0x1345e230, 0x13c5e240,
> 	0x400000fc, 0x400000fb,
> };
> 
>+
> static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
> 	[STAC_D945_REF] = ref922x_pin_configs,
> 	[STAC_D945GTP3] = d945gtp3_pin_configs,
> 	[STAC_D945GTP5] = d945gtp5_pin_configs,
>-	[STAC_MACMINI] = d945gtp5_pin_configs,
>-	[STAC_MACBOOK] = macbook_pin_configs,
>-	[STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs,
>-	[STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs,
>+	[STAC_INTEL_MAC_V1] = intel_mac_v1_pin_configs,
>+	[STAC_INTEL_MAC_V2] = intel_mac_v2_pin_configs,
>+	[STAC_INTEL_MAC_V3] = intel_mac_v3_pin_configs,
>+	[STAC_INTEL_MAC_V4] = intel_mac_v4_pin_configs,
>+	[STAC_INTEL_MAC_V5] = intel_mac_v5_pin_configs,
>+	/* for backward compatibility */
>+	[STAC_MACMINI] = intel_mac_v3_pin_configs,
>+	[STAC_MACBOOK] = intel_mac_v5_pin_configs,
>+	[STAC_MACBOOK_PRO_V1] = intel_mac_v3_pin_configs,
>+	[STAC_MACBOOK_PRO_V2] = intel_mac_v3_pin_configs,
>+	[STAC_IMAC_INTEL] = intel_mac_v2_pin_configs,
>+	[STAC_IMAC_INTEL_20] = intel_mac_v3_pin_configs,
>+	[STAC_922X_DELL_D81] = dell_922x_d81_pin_configs,
>+	[STAC_922X_DELL_D82] = dell_922x_d82_pin_configs,	
>+	[STAC_922X_DELL_M81] = dell_922x_m81_pin_configs,
>+	[STAC_922X_DELL_M82] = dell_922x_m82_pin_configs,	
> };
> 
> static const char *stac922x_models[STAC_922X_MODELS] = {
> 	[STAC_D945_REF]	= "ref",
> 	[STAC_D945GTP5]	= "5stack",
> 	[STAC_D945GTP3]	= "3stack",
>+	[STAC_INTEL_MAC_V1] = "intel-mac-v1",
>+	[STAC_INTEL_MAC_V2] = "intel-mac-v2",
>+	[STAC_INTEL_MAC_V3] = "intel-mac-v3",
>+	[STAC_INTEL_MAC_V4] = "intel-mac-v4",
>+	[STAC_INTEL_MAC_V5] = "intel-mac-v5",
>+	/* for backward compatibility */
> 	[STAC_MACMINI]	= "macmini",
> 	[STAC_MACBOOK]	= "macbook",
> 	[STAC_MACBOOK_PRO_V1]	= "macbook-pro-v1",
> 	[STAC_MACBOOK_PRO_V2]	= "macbook-pro",
>+	[STAC_IMAC_INTEL] = "imac-intel",
>+	[STAC_IMAC_INTEL_20] = "imac-intel-20",
>+	[STAC_922X_DELL_D81] = "dell-d81",
>+	[STAC_922X_DELL_D82] = "dell-d82",
>+	[STAC_922X_DELL_M81] = "dell-m81",
>+	[STAC_922X_DELL_M82] = "dell-m82",
> };
> 
> static struct snd_pci_quirk stac922x_cfg_tbl[] = {
>@@ -625,7 +1569,26 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = {
> 	/* other systems  */
> 	/* Apple Mac Mini (early 2006) */
> 	SND_PCI_QUIRK(0x8384, 0x7680,
>-		      "Mac Mini", STAC_MACMINI),
>+		      "Mac Mini", STAC_INTEL_MAC_V3),
>+	/* Dell systems  */
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a7,
>+		      "unknown Dell", STAC_922X_DELL_D81),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a9,
>+		      "unknown Dell", STAC_922X_DELL_D81),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ab,
>+		      "unknown Dell", STAC_922X_DELL_D81),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ac,
>+		      "unknown Dell", STAC_922X_DELL_D82),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01bf,
>+		      "unknown Dell", STAC_922X_DELL_M81),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d0,
>+		      "unknown Dell", STAC_922X_DELL_D82),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d1,
>+		      "unknown Dell", STAC_922X_DELL_D81),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d2,
>+		      "unknown Dell", STAC_922X_DELL_D81),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d7,
>+		      "Dell XPS M1210", STAC_922X_DELL_M82),
> 	{} /* terminator */
> };
> 
>@@ -650,16 +1613,27 @@ static unsigned int d965_5st_pin_configs[14] = {
> 	0x40000100, 0x40000100
> };
> 
>+static unsigned int dell_3st_pin_configs[14] = {
>+	0x02211230, 0x02a11220, 0x01a19040, 0x01114210,
>+	0x01111212, 0x01116211, 0x01813050, 0x01112214,
>+	0x403003fa, 0x90a60040, 0x90a60040, 0x404003fb,
>+	0x40c003fc, 0x40000100
>+};
>+
> static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
>-	[STAC_D965_REF] = ref927x_pin_configs,
>-	[STAC_D965_3ST] = d965_3st_pin_configs,
>-	[STAC_D965_5ST] = d965_5st_pin_configs,
>+	[STAC_D965_REF]  = ref927x_pin_configs,
>+	[STAC_D965_3ST]  = d965_3st_pin_configs,
>+	[STAC_D965_5ST]  = d965_5st_pin_configs,
>+	[STAC_DELL_3ST]  = dell_3st_pin_configs,
>+	[STAC_DELL_BIOS] = NULL,
> };
> 
> static const char *stac927x_models[STAC_927X_MODELS] = {
>-	[STAC_D965_REF]	= "ref",
>-	[STAC_D965_3ST]	= "3stack",
>-	[STAC_D965_5ST] = "5stack",
>+	[STAC_D965_REF]		= "ref",
>+	[STAC_D965_3ST]		= "3stack",
>+	[STAC_D965_5ST]		= "5stack",
>+	[STAC_DELL_3ST]		= "dell-3stack",
>+	[STAC_DELL_BIOS]	= "dell-bios",
> };
> 
> static struct snd_pci_quirk stac927x_cfg_tbl[] = {
>@@ -686,6 +1660,20 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2003, "Intel D965", STAC_D965_3ST),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2002, "Intel D965", STAC_D965_3ST),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2001, "Intel D965", STAC_D965_3ST),
>+	/* Dell 3 stack systems */
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f7, "Dell XPS M1730", STAC_DELL_3ST),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01dd, "Dell Dimension E520", STAC_DELL_3ST),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01ed, "Dell     ", STAC_DELL_3ST),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f4, "Dell     ", STAC_DELL_3ST),
>+	/* Dell 3 stack systems with verb table in BIOS */
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f3, "Dell Inspiron 1420", STAC_DELL_BIOS),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0227, "Dell Vostro 1400  ", STAC_DELL_BIOS),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022f, "Dell     ", STAC_DELL_BIOS),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022e, "Dell     ", STAC_DELL_BIOS),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0242, "Dell     ", STAC_DELL_BIOS),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0243, "Dell     ", STAC_DELL_BIOS),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x02ff, "Dell     ", STAC_DELL_BIOS),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0209, "Dell XPS 1330", STAC_DELL_BIOS),
> 	/* 965 based 5 stack systems */
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2301, "Intel D965", STAC_D965_5ST),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2302, "Intel D965", STAC_D965_5ST),
>@@ -701,30 +1689,58 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {
> 
> static unsigned int ref9205_pin_configs[12] = {
> 	0x40000100, 0x40000100, 0x01016011, 0x01014010,
>-	0x01813122, 0x01a19021, 0x40000100, 0x40000100,
>+	0x01813122, 0x01a19021, 0x01019020, 0x40000100,
> 	0x90a000f0, 0x90a000f0, 0x01441030, 0x01c41030
> };
> 
>-static unsigned int dell_m43_9205_pin_configs[12] = {
>+/*
>+    STAC 9205 pin configs for
>+    102801F1
>+    102801F2
>+    102801FC
>+    102801FD
>+    10280204
>+    1028021F
>+    10280228 (Dell Vostro 1500)
>+*/
>+static unsigned int dell_9205_m42_pin_configs[12] = {
>+	0x0321101F, 0x03A11020, 0x400003FA, 0x90170310,
>+	0x400003FB, 0x400003FC, 0x400003FD, 0x40F000F9,
>+	0x90A60330, 0x400003FF, 0x0144131F, 0x40C003FE,
>+};
>+
>+/*
>+    STAC 9205 pin configs for
>+    102801F9
>+    102801FA
>+    102801FE
>+    102801FF (Dell Precision M4300)
>+    10280206
>+    10280200
>+    10280201
>+*/
>+static unsigned int dell_9205_m43_pin_configs[12] = {
> 	0x0321101f, 0x03a11020, 0x90a70330, 0x90170310,
> 	0x400000fe, 0x400000ff, 0x400000fd, 0x40f000f9,
> 	0x400000fa, 0x400000fc, 0x0144131f, 0x40c003f8,
> };
> 
>-static unsigned int dell_m44_9205_pin_configs[12] = {
>+static unsigned int dell_9205_m44_pin_configs[12] = {
> 	0x0421101f, 0x04a11020, 0x400003fa, 0x90170310,
> 	0x400003fb, 0x400003fc, 0x400003fd, 0x400003f9,
> 	0x90a60330, 0x400003ff, 0x01441340, 0x40c003fe,
> };
>- 
>+
> static unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = {
> 	[STAC_9205_REF] = ref9205_pin_configs,
>-	[STAC_9205_DELL_M43] = dell_m43_9205_pin_configs,
>-	[STAC_9205_DELL_M44] = dell_m44_9205_pin_configs,
>+	[STAC_9205_DELL_M42] = dell_9205_m42_pin_configs,
>+	[STAC_9205_DELL_M43] = dell_9205_m43_pin_configs,
>+	[STAC_9205_DELL_M44] = dell_9205_m44_pin_configs,
> };
> 
> static const char *stac9205_models[STAC_9205_MODELS] = {
> 	[STAC_9205_REF] = "ref",
>+	[STAC_9205_DELL_M42] = "dell-m42",
> 	[STAC_9205_DELL_M43] = "dell-m43",
> 	[STAC_9205_DELL_M44] = "dell-m44",
> };
>@@ -733,20 +1749,28 @@ static struct snd_pci_quirk stac9205_cfg_tbl[] = {
> 	/* SigmaTel reference board */
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
> 		      "DFI LanParty", STAC_9205_REF),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f1,
>+		      "unknown Dell", STAC_9205_DELL_M42),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f2,
>+		      "unknown Dell", STAC_9205_DELL_M42),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f8,
> 		      "Dell Precision", STAC_9205_DELL_M43),
>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021b,
>-		      "Dell Precision", STAC_9205_DELL_M43),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021c,
>-		      "Dell Precision", STAC_9205_DELL_M43),
>+			  "Dell Precision", STAC_9205_DELL_M43),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f9,
> 		      "Dell Precision", STAC_9205_DELL_M43),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021b,
>+		      "Dell Precision", STAC_9205_DELL_M43),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fa,
> 		      "Dell Precision", STAC_9205_DELL_M43),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fc,
>+		      "unknown Dell", STAC_9205_DELL_M42),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fd,
>+		      "unknown Dell", STAC_9205_DELL_M42),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fe,
> 		      "Dell Precision", STAC_9205_DELL_M43),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ff,
>-		      "Dell Precision", STAC_9205_DELL_M43),
>+		      "Dell Precision M4300", STAC_9205_DELL_M43),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0206,
> 		      "Dell Precision", STAC_9205_DELL_M43),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f1,
>@@ -757,8 +1781,12 @@ static struct snd_pci_quirk stac9205_cfg_tbl[] = {
> 		      "Dell Inspiron", STAC_9205_DELL_M44),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fd,
> 		      "Dell Inspiron", STAC_9205_DELL_M44),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0204,
>+		      "unknown Dell", STAC_9205_DELL_M42),
> 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021f,
> 		      "Dell Inspiron", STAC_9205_DELL_M44),
>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0228,
>+		      "Dell Vostro 1500", STAC_9205_DELL_M42),
> 	{} /* terminator */
> };
> 
>@@ -789,7 +1817,7 @@ static int stac92xx_save_bios_config_regs(struct hda_codec *codec)
> }
> 
> static void stac92xx_set_config_reg(struct hda_codec *codec,
>-				     hda_nid_t pin_nid, unsigned int pin_config)
>+				    hda_nid_t pin_nid, unsigned int pin_config)
> {
> 	int i;
> 	snd_hda_codec_write(codec, pin_nid, 0,
>@@ -806,7 +1834,7 @@ static void stac92xx_set_config_reg(struct hda_codec *codec,
> 			    pin_config >> 24);
> 	i = snd_hda_codec_read(codec, pin_nid, 0,
> 			       AC_VERB_GET_CONFIG_DEFAULT,
>-			       0x00);
>+			       0x00);	
> 	snd_printdd(KERN_INFO "hda_codec: pin nid %2.2x pin config %8.8x\n",
> 		    pin_nid, i);
> }
>@@ -816,27 +1844,12 @@ static void stac92xx_set_config_regs(struct hda_codec *codec)
> 	int i;
> 	struct sigmatel_spec *spec = codec->spec;
> 
>-	if (!spec->pin_configs)
>-		return;
>-	for (i = 0; i < spec->num_pins; i++)
>-	     stac92xx_set_config_reg(codec, spec->pin_nids[i],
>-				     spec->pin_configs[i]);
>-}
>+ 	if (!spec->pin_configs)
>+ 		return;
> 
>-static void stac92xx_enable_gpio_mask(struct hda_codec *codec)
>-{
>-	struct sigmatel_spec *spec = codec->spec;
>-	/* Configure GPIOx as output */
>-	snd_hda_codec_write(codec, codec->afg, 0,
>-			    AC_VERB_SET_GPIO_DIRECTION, spec->gpio_mask);
>-	/* Configure GPIOx as CMOS */
>-	snd_hda_codec_write(codec, codec->afg, 0, 0x7e7, 0x00000000);
>-	/* Assert GPIOx */
>-	snd_hda_codec_write(codec, codec->afg, 0,
>-			    AC_VERB_SET_GPIO_DATA, spec->gpio_data);
>-	/* Enable GPIOx */
>-	snd_hda_codec_write(codec, codec->afg, 0,
>-			    AC_VERB_SET_GPIO_MASK, spec->gpio_mask);
>+	for (i = 0; i < spec->num_pins; i++)
>+		stac92xx_set_config_reg(codec, spec->pin_nids[i],
>+					spec->pin_configs[i]);
> }
> 
> /*
>@@ -847,7 +1860,8 @@ static int stac92xx_playback_pcm_open(struct hda_pcm_stream *hinfo,
> 				      struct snd_pcm_substream *substream)
> {
> 	struct sigmatel_spec *spec = codec->spec;
>-	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
>+	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
>+					     hinfo);
> }
> 
> static int stac92xx_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
>@@ -887,6 +1901,17 @@ static int stac92xx_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
> 	return snd_hda_multi_out_dig_close(codec, &spec->multiout);
> }
> 
>+static int stac92xx_dig_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 sigmatel_spec *spec = codec->spec;
>+	return snd_hda_multi_out_dig_prepare(codec, &spec->multiout,
>+					     stream_tag, format, substream);
>+}
>+
> 
> /*
>  * Analog capture callbacks
>@@ -910,7 +1935,7 @@ static int stac92xx_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
> {
> 	struct sigmatel_spec *spec = codec->spec;
> 
>-	snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number], 0, 0, 0);
>+	snd_hda_codec_cleanup_stream(codec, spec->adc_nids[substream->number]);
> 	return 0;
> }
> 
>@@ -921,7 +1946,8 @@ static struct hda_pcm_stream stac92xx_pcm_digital_playback = {
> 	/* NID is set in stac92xx_build_pcms */
> 	.ops = {
> 		.open = stac92xx_dig_playback_pcm_open,
>-		.close = stac92xx_dig_playback_pcm_close
>+		.close = stac92xx_dig_playback_pcm_close,
>+		.prepare = stac92xx_dig_playback_pcm_prepare
> 	},
> };
> 
>@@ -957,10 +1983,9 @@ static struct hda_pcm_stream stac92xx_pcm_analog_alt_playback = {
> };
> 
> static struct hda_pcm_stream stac92xx_pcm_analog_capture = {
>-	.substreams = 2,
> 	.channels_min = 2,
> 	.channels_max = 2,
>-	/* NID is set in stac92xx_build_pcms */
>+	/* NID + .substreams is set in stac92xx_build_pcms */
> 	.ops = {
> 		.prepare = stac92xx_capture_pcm_prepare,
> 		.cleanup = stac92xx_capture_pcm_cleanup
>@@ -979,6 +2004,7 @@ static int stac92xx_build_pcms(struct hda_codec *codec)
> 	info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_analog_playback;
> 	info->stream[SNDRV_PCM_STREAM_CAPTURE] = stac92xx_pcm_analog_capture;
> 	info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
>+	info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec->num_adcs;
> 
> 	if (spec->alt_switch) {
> 		codec->num_pcms++;
>@@ -991,6 +2017,7 @@ static int stac92xx_build_pcms(struct hda_codec *codec)
> 		codec->num_pcms++;
> 		info++;
> 		info->name = "STAC92xx Digital";
>+		info->pcm_type = HDA_PCM_TYPE_SPDIF;
> 		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;
>@@ -1023,18 +2050,40 @@ static unsigned int stac92xx_get_vref(struct hda_codec *codec, hda_nid_t nid)
> 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);
>+	snd_hda_codec_write_cache(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)
>+#define stac92xx_hp_switch_info		snd_ctl_boolean_mono_info
>+
>+static int stac92xx_hp_switch_get(struct snd_kcontrol *kcontrol,
>+			struct snd_ctl_elem_value *ucontrol)
> {
>-	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
>-	uinfo->count = 1;
>-	uinfo->value.integer.min = 0;
>-	uinfo->value.integer.max = 1;
>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>+	struct sigmatel_spec *spec = codec->spec;
>+
>+	ucontrol->value.integer.value[0] = spec->hp_switch;
> 	return 0;
> }
> 
>+static int stac92xx_hp_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;
>+
>+	spec->hp_switch = ucontrol->value.integer.value[0];
>+
>+	/* check to be sure that the ports are upto date with
>+	 * switch changes
>+	 */
>+	codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
>+
>+	return 1;
>+}
>+
>+#define stac92xx_io_switch_info		snd_ctl_boolean_mono_info
>+
> static int stac92xx_io_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
> {
> 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>@@ -1051,7 +2100,7 @@ static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
> 	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];
>+	unsigned short val = !!ucontrol->value.integer.value[0];
> 
> 	spec->io_switch[io_idx] = val;
> 
>@@ -1063,9 +2112,56 @@ static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
> 			pinctl |= stac92xx_get_vref(codec, nid);
> 		stac92xx_auto_set_pinctl(codec, nid, pinctl);
> 	}
>+
>+	/* check the auto-mute again: we need to mute/unmute the speaker
>+	 * appropriately according to the pin direction
>+	 */
>+	if (spec->hp_detect)
>+		codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
>+
>         return 1;
> }
> 
>+#define stac92xx_clfe_switch_info snd_ctl_boolean_mono_info
>+
>+static int stac92xx_clfe_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;
>+
>+	ucontrol->value.integer.value[0] = spec->clfe_swap;
>+	return 0;
>+}
>+
>+static int stac92xx_clfe_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 & 0xff;
>+	unsigned int val = !!ucontrol->value.integer.value[0];
>+
>+	if (spec->clfe_swap == val)
>+		return 0;
>+
>+	spec->clfe_swap = val;
>+
>+	snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_EAPD_BTLENABLE,
>+		spec->clfe_swap ? 0x4 : 0x0);
>+
>+	return 1;
>+}
>+
>+#define STAC_CODEC_HP_SWITCH(xname) \
>+	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
>+	  .name = xname, \
>+	  .index = 0, \
>+	  .info = stac92xx_hp_switch_info, \
>+	  .get = stac92xx_hp_switch_get, \
>+	  .put = stac92xx_hp_switch_put, \
>+	}
>+
> #define STAC_CODEC_IO_SWITCH(xname, xpval) \
> 	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
> 	  .name = xname, \
>@@ -1076,17 +2172,32 @@ static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
>           .private_value = xpval, \
> 	}
> 
>+#define STAC_CODEC_CLFE_SWITCH(xname, xpval) \
>+	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
>+	  .name = xname, \
>+	  .index = 0, \
>+	  .info = stac92xx_clfe_switch_info, \
>+	  .get = stac92xx_clfe_switch_get, \
>+	  .put = stac92xx_clfe_switch_put, \
>+	  .private_value = xpval, \
>+	}
> 
> enum {
> 	STAC_CTL_WIDGET_VOL,
> 	STAC_CTL_WIDGET_MUTE,
>+	STAC_CTL_WIDGET_MONO_MUX,
>+	STAC_CTL_WIDGET_HP_SWITCH,
> 	STAC_CTL_WIDGET_IO_SWITCH,
>+	STAC_CTL_WIDGET_CLFE_SWITCH
> };
> 
> static struct snd_kcontrol_new stac92xx_control_templates[] = {
> 	HDA_CODEC_VOLUME(NULL, 0, 0, 0),
> 	HDA_CODEC_MUTE(NULL, 0, 0, 0),
>+	STAC_MONO_MUX,
>+	STAC_CODEC_HP_SWITCH(NULL),
> 	STAC_CODEC_IO_SWITCH(NULL, 0),
>+	STAC_CODEC_CLFE_SWITCH(NULL, 0),
> };
> 
> /* add dynamic controls */
>@@ -1124,22 +2235,24 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cf
> 	struct sigmatel_spec *spec = codec->spec;
> 	unsigned int wcaps, wtype;
> 	int i, num_dacs = 0;
>-
>+	
> 	/* use the wcaps cache to count all DACs available for line-outs */
> 	for (i = 0; i < codec->num_nodes; i++) {
> 		wcaps = codec->wcaps[i];
> 		wtype = (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
>+
> 		if (wtype == AC_WID_AUD_OUT && !(wcaps & AC_WCAP_DIGITAL))
> 			num_dacs++;
> 	}
> 
> 	snd_printdd("%s: total dac count=%d\n", __func__, num_dacs);
>-
>+	
> 	switch (cfg->line_outs) {
> 	case 3:
> 		/* add line-in as side */
> 		if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 3) {
>-			cfg->line_out_pins[3] = cfg->input_pins[AUTO_PIN_LINE];
>+			cfg->line_out_pins[cfg->line_outs] =
>+				cfg->input_pins[AUTO_PIN_LINE];
> 			spec->line_switch = 1;
> 			cfg->line_outs++;
> 		}
>@@ -1147,12 +2260,14 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cf
> 	case 2:
> 		/* add line-in as clfe and mic as side */
> 		if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 2) {
>-			cfg->line_out_pins[2] = cfg->input_pins[AUTO_PIN_LINE];
>+			cfg->line_out_pins[cfg->line_outs] =
>+				cfg->input_pins[AUTO_PIN_LINE];
> 			spec->line_switch = 1;
> 			cfg->line_outs++;
> 		}
> 		if (cfg->input_pins[AUTO_PIN_MIC] && num_dacs > 3) {
>-			cfg->line_out_pins[3] = cfg->input_pins[AUTO_PIN_MIC];
>+			cfg->line_out_pins[cfg->line_outs] =
>+				cfg->input_pins[AUTO_PIN_MIC];
> 			spec->mic_switch = 1;
> 			cfg->line_outs++;
> 		}
>@@ -1160,12 +2275,14 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cf
> 	case 1:
> 		/* add line-in as surr and mic as clfe */
> 		if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 1) {
>-			cfg->line_out_pins[1] = cfg->input_pins[AUTO_PIN_LINE];
>+			cfg->line_out_pins[cfg->line_outs] =
>+				cfg->input_pins[AUTO_PIN_LINE];
> 			spec->line_switch = 1;
> 			cfg->line_outs++;
> 		}
> 		if (cfg->input_pins[AUTO_PIN_MIC] && num_dacs > 2) {
>-			cfg->line_out_pins[2] = cfg->input_pins[AUTO_PIN_MIC];
>+			cfg->line_out_pins[cfg->line_outs] =
>+				cfg->input_pins[AUTO_PIN_MIC];
> 			spec->mic_switch = 1;
> 			cfg->line_outs++;
> 		}
>@@ -1175,10 +2292,11 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cf
> 	return 0;
> }
> 
>+
> static int is_in_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)
> {
> 	int i;
>-
>+	
> 	for (i = 0; i < spec->multiout.num_dacs; i++) {
> 		if (spec->multiout.dac_nids[i] == nid)
> 			return 1;
>@@ -1192,25 +2310,24 @@ static int is_in_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)
>  * This function only works when every pin in line_out_pins[]
>  * contains atleast one DAC in its connection list. Some 92xx
>  * codecs are not connected directly to a DAC, such as the 9200
>- * and 9202/925x. For those, dac_nids[] must be hard-coded. 
>+ * and 9202/925x. For those, dac_nids[] must be hard-coded.
>  */
> static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec,
>-				       const struct auto_pin_cfg *cfg)
>+				       struct auto_pin_cfg *cfg)
> {
> 	struct sigmatel_spec *spec = codec->spec;
>-	int i, j, conn_len = 0;
>+	int i, j, conn_len = 0; 
> 	hda_nid_t nid, conn[HDA_MAX_CONNECTIONS];
>-	unsigned int wcaps, wtype; 
>-
>+	unsigned int wcaps, wtype;
>+	
> 	for (i = 0; i < cfg->line_outs; i++) {
> 		nid = cfg->line_out_pins[i];
> 		conn_len = snd_hda_get_connections(codec, nid, conn,
>-				HDA_MAX_CONNECTIONS);
>+						   HDA_MAX_CONNECTIONS);
> 		for (j = 0; j < conn_len; j++) {
> 			wcaps = snd_hda_param_read(codec, conn[j],
>-					AC_PAR_AUDIO_WIDGET_CAP);
>+						   AC_PAR_AUDIO_WIDGET_CAP);
> 			wtype = (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
>-
> 			if (wtype != AC_WID_AUD_OUT ||
> 			    (wcaps & AC_WCAP_DIGITAL))
> 				continue;
>@@ -1220,10 +2337,17 @@ static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec,
> 		}
> 
> 		if (j == conn_len) {
>+			if (spec->multiout.num_dacs > 0) {
>+				/* we have already working output pins,
>+				 * so let's drop the broken ones again
>+				 */
>+				cfg->line_outs = spec->multiout.num_dacs;
>+				break;
>+			}
> 			/* error out, no available DAC found */
> 			snd_printk(KERN_ERR
>-				"%s: No available DAC for pin 0x%x\n",
>-				__func__, nid);
>+				   "%s: No available DAC for pin 0x%x\n",
>+				   __func__, nid);
> 			return -ENODEV;
> 		}
> 
>@@ -1231,19 +2355,19 @@ static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec,
> 		spec->multiout.num_dacs++;
> 		if (conn_len > 1) {
> 			/* select this DAC in the pin's input mux */
>-			snd_hda_codec_write(codec, nid, 0,
>-				AC_VERB_SET_CONNECT_SEL, j);
>+			snd_hda_codec_write_cache(codec, nid, 0,
>+						  AC_VERB_SET_CONNECT_SEL, j);
>+
> 		}
> 	}
> 
> 	snd_printd("dac_nids=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
>-		spec->multiout.num_dacs,
>-		spec->multiout.dac_nids[0],
>-		spec->multiout.dac_nids[1],
>-		spec->multiout.dac_nids[2],
>-		spec->multiout.dac_nids[3],
>-		spec->multiout.dac_nids[4]); 
>-
>+		   spec->multiout.num_dacs,
>+		   spec->multiout.dac_nids[0],
>+		   spec->multiout.dac_nids[1],
>+		   spec->multiout.dac_nids[2],
>+		   spec->multiout.dac_nids[3],
>+		   spec->multiout.dac_nids[4]);
> 	return 0;
> }
> 
>@@ -1266,8 +2390,31 @@ static int create_controls(struct sigmatel_spec *spec, const char *pfx, hda_nid_
> 	return 0;
> }
> 
>+static int add_spec_dacs(struct sigmatel_spec *spec, hda_nid_t nid)
>+{
>+	if (!spec->multiout.hp_nid)
>+		spec->multiout.hp_nid = nid;
>+	else if (spec->multiout.num_dacs > 4) {
>+		printk(KERN_WARNING "stac92xx: No space for DAC 0x%x\n", nid);
>+		return 1;
>+	} else {
>+		spec->multiout.dac_nids[spec->multiout.num_dacs] = nid;
>+		spec->multiout.num_dacs++;
>+	}
>+	return 0;
>+}
>+
>+static int check_in_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)
>+{
>+	if (is_in_dac_nids(spec, nid))
>+		return 1;
>+	if (spec->multiout.hp_nid == nid)
>+		return 1;
>+	return 0;
>+}
>+
> /* add playback controls from the parsed DAC table */
>-static int stac92xx_auto_create_multi_out_ctls(struct sigmatel_spec *spec,
>+static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
> 					       const struct auto_pin_cfg *cfg)
> {
> 	static const char *chname[4] = {
>@@ -1276,7 +2423,11 @@ static int stac92xx_auto_create_multi_out_ctls(struct sigmatel_spec *spec,
> 	hda_nid_t nid;
> 	int i, err;
> 
>-	for (i = 0; i < cfg->line_outs; i++) {
>+	struct sigmatel_spec *spec = codec->spec;
>+	unsigned int wid_caps, pincap;
>+
>+
>+	for (i = 0; i < cfg->line_outs && i < spec->multiout.num_dacs; i++) {
> 		if (!spec->multiout.dac_nids[i])
> 			continue;
> 
>@@ -1290,6 +2441,18 @@ static int stac92xx_auto_create_multi_out_ctls(struct sigmatel_spec *spec,
> 			err = create_controls(spec, "LFE", nid, 2);
> 			if (err < 0)
> 				return err;
>+
>+			wid_caps = get_wcaps(codec, nid);
>+
>+			if (wid_caps & AC_WCAP_LR_SWAP) {
>+				err = stac92xx_add_control(spec,
>+					STAC_CTL_WIDGET_CLFE_SWITCH,
>+					"Swap Center/LFE Playback Switch", nid);
>+
>+				if (err < 0)
>+					return err;
>+			}
>+
> 		} else {
> 			err = create_controls(spec, chname[i], nid, 3);
> 			if (err < 0)
>@@ -1297,37 +2460,56 @@ static int stac92xx_auto_create_multi_out_ctls(struct sigmatel_spec *spec,
> 		}
> 	}
> 
>-	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)
>+	if (cfg->hp_outs > 1) {
>+		err = stac92xx_add_control(spec,
>+			STAC_CTL_WIDGET_HP_SWITCH,
>+			"Headphone as Line Out Switch", 0);
>+		if (err < 0)
> 			return err;
>+	}
> 
>-	return 0;
>-}
>-
>-static int check_in_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)
>-{
>-	if (is_in_dac_nids(spec, nid))
>-		return 1; 
>-	if (spec->multiout.hp_nid == nid)
>-		return 1;
>-	return 0;
>-}
>+	if (spec->line_switch) {
>+		nid = cfg->input_pins[AUTO_PIN_LINE];
>+		pincap = snd_hda_param_read(codec, nid,
>+						AC_PAR_PIN_CAP);
>+		if (pincap & AC_PINCAP_OUT) {
>+			err = stac92xx_add_control(spec,
>+				STAC_CTL_WIDGET_IO_SWITCH,
>+				"Line In as Output Switch", nid << 8);
>+			if (err < 0)
>+				return err;
>+		}
>+	}
> 
>-static int add_spec_dacs(struct sigmatel_spec *spec, hda_nid_t nid)
>-{
>-	if (!spec->multiout.hp_nid)
>-		spec->multiout.hp_nid = nid;
>-	else if (spec->multiout.num_dacs > 4) {
>-		printk(KERN_WARNING "stac92xx: No space for DAC 0x%x\n", nid);
>-		return 1;
>-	} else {
>-		spec->multiout.dac_nids[spec->multiout.num_dacs] = nid;
>-		spec->multiout.num_dacs++;
>+	if (spec->mic_switch) {
>+		unsigned int def_conf;
>+		unsigned int mic_pin = AUTO_PIN_MIC;
>+again:
>+		nid = cfg->input_pins[mic_pin];
>+		def_conf = snd_hda_codec_read(codec, nid, 0,
>+						AC_VERB_GET_CONFIG_DEFAULT, 0);
>+		/* some laptops have an internal analog microphone
>+		 * which can't be used as a output */
>+		if (get_defcfg_connect(def_conf) != AC_JACK_PORT_FIXED) {
>+			pincap = snd_hda_param_read(codec, nid,
>+							AC_PAR_PIN_CAP);
>+			if (pincap & AC_PINCAP_OUT) {
>+				err = stac92xx_add_control(spec,
>+					STAC_CTL_WIDGET_IO_SWITCH,
>+					"Mic as Output Switch", (nid << 8) | 1);
>+				nid = snd_hda_codec_read(codec, nid, 0,
>+					 AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
>+				if (!check_in_dac_nids(spec, nid))
>+					add_spec_dacs(spec, nid);
>+				if (err < 0)
>+					return err;
>+			}
>+		} else if (mic_pin == AUTO_PIN_MIC) {
>+			mic_pin = AUTO_PIN_FRONT_MIC;
>+			goto again;
>+		}
> 	}
>+
> 	return 0;
> }
> 
>@@ -1361,7 +2543,15 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec,
> 			continue;
> 		add_spec_dacs(spec, nid);
> 	}
>-
>+	for (i = 0; i < cfg->line_outs; i++) {
>+		nid = snd_hda_codec_read(codec, cfg->line_out_pins[i], 0,
>+					AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
>+		if (check_in_dac_nids(spec, nid))
>+			nid = 0;
>+		if (! nid)
>+			continue;
>+		add_spec_dacs(spec, nid);
>+	}
> 	for (i = old_num_dacs; i < spec->multiout.num_dacs; i++) {
> 		static const char *pfxs[] = {
> 			"Speaker", "External Speaker", "Speaker2",
>@@ -1372,12 +2562,8 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec,
> 			return err;
> 	}
> 	if (spec->multiout.hp_nid) {
>-		const char *pfx;
>-		if (old_num_dacs == spec->multiout.num_dacs)
>-			pfx = "Master";
>-		else
>-			pfx = "Headphone";
>-		err = create_controls(spec, pfx, spec->multiout.hp_nid, 3);
>+		err = create_controls(spec, "Headphone",
>+				      spec->multiout.hp_nid, 3);
> 		if (err < 0)
> 			return err;
> 	}
>@@ -1385,6 +2571,37 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec,
> 	return 0;
> }
> 
>+/* labels for mono mux outputs */
>+static const char *stac92xx_mono_labels[3] = {
>+	"DAC0", "DAC1", "Mixer"
>+};
>+
>+/* create mono mux for mono out on capable codecs */
>+static int stac92xx_auto_create_mono_output_ctls(struct hda_codec *codec)
>+{
>+	struct sigmatel_spec *spec = codec->spec;
>+	struct hda_input_mux *mono_mux = &spec->private_mono_mux;
>+	int i, num_cons;
>+	hda_nid_t con_lst[ARRAY_SIZE(stac92xx_mono_labels)];
>+
>+	num_cons = snd_hda_get_connections(codec,
>+				spec->mono_nid,
>+				con_lst,
>+				HDA_MAX_NUM_INPUTS);
>+	if (!num_cons || num_cons > ARRAY_SIZE(stac92xx_mono_labels))
>+		return -EINVAL;
>+
>+	for (i = 0; i < num_cons; i++) {
>+		mono_mux->items[mono_mux->num_items].label =
>+					stac92xx_mono_labels[i];
>+		mono_mux->items[mono_mux->num_items].index = i;
>+		mono_mux->num_items++;
>+	}
>+
>+	return stac92xx_add_control(spec, STAC_CTL_WIDGET_MONO_MUX,
>+				"Mono Mux", spec->mono_nid);
>+}
>+
> /* labels for dmic mux inputs */
> static const char *stac92xx_dmic_labels[5] = {
> 	"Analog Inputs", "Digital Mic 1", "Digital Mic 2",
>@@ -1398,15 +2615,18 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec,
> 	struct sigmatel_spec *spec = codec->spec;
> 	struct hda_input_mux *dimux = &spec->private_dimux;
> 	hda_nid_t con_lst[HDA_MAX_NUM_INPUTS];
>-	int i, j;
>+	int err, i, j;
>+	char name[32];
> 
> 	dimux->items[dimux->num_items].label = stac92xx_dmic_labels[0];
> 	dimux->items[dimux->num_items].index = 0;
> 	dimux->num_items++;
> 
> 	for (i = 0; i < spec->num_dmics; i++) {
>+		hda_nid_t nid;
> 		int index;
> 		int num_cons;
>+		unsigned int wcaps;
> 		unsigned int def_conf;
> 
> 		def_conf = snd_hda_codec_read(codec,
>@@ -1417,17 +2637,32 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec,
> 		if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)
> 			continue;
> 
>+		nid = spec->dmic_nids[i];
> 		num_cons = snd_hda_get_connections(codec,
>-				spec->dmux_nid,
>+				spec->dmux_nids[0],
> 				con_lst,
> 				HDA_MAX_NUM_INPUTS);
> 		for (j = 0; j < num_cons; j++)
>-			if (con_lst[j] == spec->dmic_nids[i]) {
>+			if (con_lst[j] == nid) {
> 				index = j;
> 				goto found;
> 			}
> 		continue;
> found:
>+		wcaps = get_wcaps(codec, nid);
>+
>+		if (wcaps & AC_WCAP_OUT_AMP) {
>+			sprintf(name, "%s Capture Volume",
>+				stac92xx_dmic_labels[dimux->num_items]);
>+
>+			err = stac92xx_add_control(spec,
>+				STAC_CTL_WIDGET_VOL,
>+				name,
>+				HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+		}
>+
> 		dimux->items[dimux->num_items].label =
> 			stac92xx_dmic_labels[dimux->num_items];
> 		dimux->items[dimux->num_items].index = index;
>@@ -1477,9 +2712,9 @@ static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const
> 		 * NID lists.  Hopefully this won't get confused.
> 		 */
> 		for (i = 0; i < spec->num_muxes; i++) {
>-			snd_hda_codec_write(codec, spec->mux_nids[i], 0,
>-					    AC_VERB_SET_CONNECT_SEL,
>-					    imux->items[0].index);
>+			snd_hda_codec_write_cache(codec, spec->mux_nids[i], 0,
>+						  AC_VERB_SET_CONNECT_SEL,
>+						  imux->items[0].index);
> 		}
> 	}
> 
>@@ -1520,6 +2755,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
> {
> 	struct sigmatel_spec *spec = codec->spec;
> 	int err;
>+	int hp_speaker_swap = 0;
> 
> 	if ((err = snd_hda_parse_pin_def_config(codec,
> 						&spec->autocfg,
>@@ -1528,17 +2764,108 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
> 	if (! spec->autocfg.line_outs)
> 		return 0; /* can't find valid pin config */
> 
>+	/* If we have no real line-out pin and multiple hp-outs, HPs should
>+	 * be set up as multi-channel outputs.
>+	 */
>+	if (spec->autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT &&
>+	    spec->autocfg.hp_outs > 1) {
>+		/* Copy hp_outs to line_outs, backup line_outs in
>+		 * speaker_outs so that the following routines can handle
>+		 * HP pins as primary outputs.
>+		 */
>+		memcpy(spec->autocfg.speaker_pins, spec->autocfg.line_out_pins,
>+		       sizeof(spec->autocfg.line_out_pins));
>+		spec->autocfg.speaker_outs = spec->autocfg.line_outs;
>+		memcpy(spec->autocfg.line_out_pins, spec->autocfg.hp_pins,
>+		       sizeof(spec->autocfg.hp_pins));
>+		spec->autocfg.line_outs = spec->autocfg.hp_outs;
>+		hp_speaker_swap = 1;
>+	}
>+	if (spec->autocfg.mono_out_pin) {
>+		int dir = (get_wcaps(codec, spec->autocfg.mono_out_pin)
>+				& AC_WCAP_OUT_AMP) ? HDA_OUTPUT : HDA_INPUT;
>+		u32 caps = query_amp_caps(codec,
>+				spec->autocfg.mono_out_pin, dir);
>+		hda_nid_t conn_list[1];
>+
>+		/* get the mixer node and then the mono mux if it exists */
>+		if (snd_hda_get_connections(codec,
>+				spec->autocfg.mono_out_pin, conn_list, 1) &&
>+				snd_hda_get_connections(codec, conn_list[0],
>+				conn_list, 1)) {
>+
>+				int wcaps = get_wcaps(codec, conn_list[0]);
>+				int wid_type = (wcaps & AC_WCAP_TYPE)
>+					>> AC_WCAP_TYPE_SHIFT;
>+				/* LR swap check, some stac925x have a mux that
>+ 				 * changes the DACs output path instead of the
>+ 				 * mono-mux path.
>+ 				 */
>+				if (wid_type == AC_WID_AUD_SEL &&
>+						!(wcaps & AC_WCAP_LR_SWAP))
>+					spec->mono_nid = conn_list[0];
>+		}
>+		/* all mono outs have a least a mute/unmute switch */
>+		err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE,
>+			"Mono Playback Switch",
>+			HDA_COMPOSE_AMP_VAL(spec->autocfg.mono_out_pin,
>+					1, 0, dir));
>+		if (err < 0)
>+			return err;
>+		/* check to see if there is volume support for the amp */
>+		if ((caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT) {
>+			err = stac92xx_add_control(spec, STAC_CTL_WIDGET_VOL,
>+				"Mono Playback Volume",
>+				HDA_COMPOSE_AMP_VAL(spec->autocfg.mono_out_pin,
>+					1, 0, dir));
>+			if (err < 0)
>+				return err;
>+		}
>+
>+		stac92xx_auto_set_pinctl(codec, spec->autocfg.mono_out_pin,
>+					 AC_PINCTL_OUT_EN);
>+	}
>+
> 	if ((err = stac92xx_add_dyn_out_pins(codec, &spec->autocfg)) < 0)
> 		return err;
> 	if (spec->multiout.num_dacs == 0)
> 		if ((err = stac92xx_auto_fill_dac_nids(codec, &spec->autocfg)) < 0)
> 			return err;
> 
>-	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)
>+	err = stac92xx_auto_create_multi_out_ctls(codec, &spec->autocfg);
>+
>+	if (err < 0)
>+		return err;
>+
>+	if (hp_speaker_swap == 1) {
>+		/* Restore the hp_outs and line_outs */
>+		memcpy(spec->autocfg.hp_pins, spec->autocfg.line_out_pins,
>+		       sizeof(spec->autocfg.line_out_pins));
>+		spec->autocfg.hp_outs = spec->autocfg.line_outs;
>+		memcpy(spec->autocfg.line_out_pins, spec->autocfg.speaker_pins,
>+		       sizeof(spec->autocfg.speaker_pins));
>+		spec->autocfg.line_outs = spec->autocfg.speaker_outs;
>+		memset(spec->autocfg.speaker_pins, 0,
>+		       sizeof(spec->autocfg.speaker_pins));
>+		spec->autocfg.speaker_outs = 0;
>+	}
>+
>+	err = stac92xx_auto_create_hp_ctls(codec, &spec->autocfg);
>+
>+	if (err < 0)
>+		return err;
>+
>+	err = stac92xx_auto_create_analog_input_ctls(codec, &spec->autocfg);
>+
>+	if (err < 0)
> 		return err;
> 
>+	if (spec->mono_nid > 0) {
>+		err = stac92xx_auto_create_mono_output_ctls(codec);
>+		if (err < 0)
>+			return err;
>+	}
>+
> 	if (spec->num_dmics > 0)
> 		if ((err = stac92xx_auto_create_dmic_input_ctls(codec,
> 						&spec->autocfg)) < 0)
>@@ -1557,7 +2884,9 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
> 		spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
> 
> 	spec->input_mux = &spec->private_imux;
>-	spec->dinput_mux = &spec->private_dimux;
>+	if (!spec->dinput_mux)
>+		spec->dinput_mux = &spec->private_dimux;
>+	spec->mono_mux = &spec->private_mono_mux;
> 
> 	return 1;
> }
>@@ -1596,7 +2925,7 @@ static int stac9200_auto_create_lfe_ctls(struct hda_codec *codec,
> 	 */
> 	for (i = 0; i < spec->autocfg.speaker_outs && lfe_pin == 0x0; i++) {
> 		hda_nid_t pin = spec->autocfg.speaker_pins[i];
>-		unsigned long wcaps = get_wcaps(codec, pin);
>+		unsigned int wcaps = get_wcaps(codec, pin);
> 		wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP);
> 		if (wcaps == AC_WCAP_OUT_AMP)
> 			/* found a mono speaker with an amp, must be lfe */
>@@ -1607,12 +2936,12 @@ static int stac9200_auto_create_lfe_ctls(struct hda_codec *codec,
> 	if (lfe_pin == 0 && spec->autocfg.speaker_outs == 0) {
> 		for (i = 0; i < spec->autocfg.line_outs && lfe_pin == 0x0; i++) {
> 			hda_nid_t pin = spec->autocfg.line_out_pins[i];
>-			unsigned long cfg;
>-			cfg = snd_hda_codec_read(codec, pin, 0,
>+			unsigned int defcfg;
>+			defcfg = snd_hda_codec_read(codec, pin, 0,
> 						 AC_VERB_GET_CONFIG_DEFAULT,
> 						 0x00);
>-			if (get_defcfg_device(cfg) == AC_JACK_SPEAKER) {
>-				unsigned long wcaps = get_wcaps(codec, pin);
>+			if (get_defcfg_device(defcfg) == AC_JACK_SPEAKER) {
>+				unsigned int wcaps = get_wcaps(codec, pin);
> 				wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP);
> 				if (wcaps == AC_WCAP_OUT_AMP)
> 					/* found a mono speaker with an amp,
>@@ -1667,47 +2996,67 @@ static int stac9200_parse_auto_config(struct hda_codec *codec)
>  * funky external mute control using GPIO pins.
>  */
> 
>-static void stac922x_gpio_mute(struct hda_codec *codec, int pin, int muted)
>+static void stac_gpio_set(struct hda_codec *codec, unsigned int mask,
>+			  unsigned int dir_mask, unsigned int data)
> {
> 	unsigned int gpiostate, gpiomask, gpiodir;
> 
> 	gpiostate = snd_hda_codec_read(codec, codec->afg, 0,
> 				       AC_VERB_GET_GPIO_DATA, 0);
>-
>-	if (!muted)
>-		gpiostate |= (1 << pin);
>-	else
>-		gpiostate &= ~(1 << pin);
>+	gpiostate = (gpiostate & ~dir_mask) | (data & dir_mask);
> 
> 	gpiomask = snd_hda_codec_read(codec, codec->afg, 0,
> 				      AC_VERB_GET_GPIO_MASK, 0);
>-	gpiomask |= (1 << pin);
>+	gpiomask |= mask;
> 
> 	gpiodir = snd_hda_codec_read(codec, codec->afg, 0,
> 				     AC_VERB_GET_GPIO_DIRECTION, 0);
>-	gpiodir |= (1 << pin);
>+	gpiodir |= dir_mask;
> 
>-	/* AppleHDA seems to do this -- WTF is this verb?? */
>+	/* Configure GPIOx as CMOS */
> 	snd_hda_codec_write(codec, codec->afg, 0, 0x7e7, 0);
> 
> 	snd_hda_codec_write(codec, codec->afg, 0,
> 			    AC_VERB_SET_GPIO_MASK, gpiomask);
>-	snd_hda_codec_write(codec, codec->afg, 0,
>-			    AC_VERB_SET_GPIO_DIRECTION, gpiodir);
>+	snd_hda_codec_read(codec, codec->afg, 0,
>+			   AC_VERB_SET_GPIO_DIRECTION, gpiodir); /* sync */
> 
> 	msleep(1);
> 
>-	snd_hda_codec_write(codec, codec->afg, 0,
>-			    AC_VERB_SET_GPIO_DATA, gpiostate);
>+	snd_hda_codec_read(codec, codec->afg, 0,
>+			   AC_VERB_SET_GPIO_DATA, gpiostate); /* sync */
> }
> 
> static void enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,
> 			      unsigned int event)
> {
> 	if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP)
>-		snd_hda_codec_write(codec, nid, 0,
>-				    AC_VERB_SET_UNSOLICITED_ENABLE,
>-				    (AC_USRSP_EN | event));
>+		snd_hda_codec_write_cache(codec, nid, 0,
>+					  AC_VERB_SET_UNSOLICITED_ENABLE,
>+					  (AC_USRSP_EN | event));
>+}
>+
>+static int is_nid_hp_pin(struct auto_pin_cfg *cfg, hda_nid_t nid)
>+{
>+	int i;
>+	for (i = 0; i < cfg->hp_outs; i++)
>+		if (cfg->hp_pins[i] == nid)
>+			return 1; /* nid is a HP-Out */
>+
>+	return 0; /* nid is not a HP-Out */
>+};
>+
>+static void stac92xx_power_down(struct hda_codec *codec)
>+{
>+	struct sigmatel_spec *spec = codec->spec;
>+
>+	/* power down inactive DACs */
>+	hda_nid_t *dac;
>+	for (dac = spec->dac_list; *dac; dac++)
>+		if (!is_in_dac_nids(spec, *dac) &&
>+			spec->multiout.hp_nid != *dac)
>+			snd_hda_codec_write_cache(codec, *dac, 0,
>+					AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
> }
> 
> static int stac92xx_init(struct hda_codec *codec)
>@@ -1745,11 +3094,29 @@ static int stac92xx_init(struct hda_codec *codec)
> 			stac92xx_auto_set_pinctl(codec, nid, pinctl);
> 		}
> 	}
>-	if (spec->num_dmics > 0)
>-		for (i = 0; i < spec->num_dmics; i++)
>-			stac92xx_auto_set_pinctl(codec, spec->dmic_nids[i],
>-						 AC_PINCTL_IN_EN);
>-
>+	for (i = 0; i < spec->num_dmics; i++)
>+		stac92xx_auto_set_pinctl(codec, spec->dmic_nids[i],
>+					AC_PINCTL_IN_EN);
>+	for (i = 0; i < spec->num_pwrs; i++)  {
>+		int event = is_nid_hp_pin(cfg, spec->pwr_nids[i])
>+					? STAC_HP_EVENT : STAC_PWR_EVENT;
>+		int pinctl = snd_hda_codec_read(codec, spec->pwr_nids[i],
>+					0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
>+		int def_conf = snd_hda_codec_read(codec, spec->pwr_nids[i],
>+					0, AC_VERB_GET_CONFIG_DEFAULT, 0);
>+		/* outputs are only ports capable of power management
>+		 * any attempts on powering down a input port cause the
>+		 * referenced VREF to act quirky.
>+		 */
>+		if (pinctl & AC_PINCTL_IN_EN)
>+			continue;
>+		if (get_defcfg_connect(def_conf) != AC_JACK_PORT_FIXED)
>+			continue;
>+		enable_pin_detect(codec, spec->pwr_nids[i], event | i);
>+		codec->patch_ops.unsol_event(codec, (event | i) << 26);
>+	}
>+	if (spec->dac_list)
>+		stac92xx_power_down(codec);
> 	if (cfg->dig_out_pin)
> 		stac92xx_auto_set_pinctl(codec, cfg->dig_out_pin,
> 					 AC_PINCTL_OUT_EN);
>@@ -1757,10 +3124,8 @@ static int stac92xx_init(struct hda_codec *codec)
> 		stac92xx_auto_set_pinctl(codec, cfg->dig_in_pin,
> 					 AC_PINCTL_IN_EN);
> 
>-	if (spec->gpio_mute) {
>-		stac922x_gpio_mute(codec, 0, 0);
>-		stac922x_gpio_mute(codec, 1, 0);
>-	}
>+	stac_gpio_set(codec, spec->gpio_mask,
>+					spec->gpio_dir, spec->gpio_data);
> 
> 	return 0;
> }
>@@ -1791,12 +3156,27 @@ static void stac92xx_set_pinctl(struct hda_codec *codec, hda_nid_t nid,
> 	unsigned int pin_ctl = snd_hda_codec_read(codec, nid,
> 			0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0x00);
> 
>+	if (pin_ctl & AC_PINCTL_IN_EN) {
>+		/*
>+		 * we need to check the current set-up direction of
>+		 * shared input pins since they can be switched via
>+		 * "xxx as Output" mixer switch
>+		 */
>+		struct sigmatel_spec *spec = codec->spec;
>+		struct auto_pin_cfg *cfg = &spec->autocfg;
>+		if ((nid == cfg->input_pins[AUTO_PIN_LINE] &&
>+		     spec->line_switch) ||
>+		    (nid == cfg->input_pins[AUTO_PIN_MIC] &&
>+		     spec->mic_switch))
>+			return;
>+	}
>+
> 	/* if setting pin direction bits, clear the current
> 	   direction bits first */
> 	if (flag & (AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN))
> 		pin_ctl &= ~(AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN);
>-
>-	snd_hda_codec_write(codec, nid, 0,
>+	
>+	snd_hda_codec_write_cache(codec, nid, 0,
> 			AC_VERB_SET_PIN_WIDGET_CONTROL,
> 			pin_ctl | flag);
> }
>@@ -1806,18 +3186,25 @@ static void stac92xx_reset_pinctl(struct hda_codec *codec, hda_nid_t nid,
> {
> 	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,
>+	snd_hda_codec_write_cache(codec, nid, 0,
> 			AC_VERB_SET_PIN_WIDGET_CONTROL,
> 			pin_ctl & ~flag);
> }
> 
>-static int get_pin_presence(struct hda_codec *codec, hda_nid_t nid)
>+static int get_hp_pin_presence(struct hda_codec *codec, hda_nid_t nid)
> {
> 	if (!nid)
> 		return 0;
> 	if (snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PIN_SENSE, 0x00)
>-	    & (1 << 31))
>-		return 1;
>+	    & (1 << 31)) {
>+		unsigned int pinctl;
>+		pinctl = snd_hda_codec_read(codec, nid, 0,
>+					    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
>+		if (pinctl & AC_PINCTL_IN_EN)
>+			return 0; /* mic- or line-input */
>+		else
>+			return 1; /* HP-output */
>+	}
> 	return 0;
> }
> 
>@@ -1825,60 +3212,106 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res)
> {
> 	struct sigmatel_spec *spec = codec->spec;
> 	struct auto_pin_cfg *cfg = &spec->autocfg;
>+	int nid = cfg->hp_pins[cfg->hp_outs - 1];
> 	int i, presence;
> 
> 	presence = 0;
>+	if (spec->gpio_mute)
>+		presence = !(snd_hda_codec_read(codec, codec->afg, 0,
>+			AC_VERB_GET_GPIO_DATA, 0) & spec->gpio_mute);
>+
> 	for (i = 0; i < cfg->hp_outs; i++) {
>-		presence = get_pin_presence(codec, cfg->hp_pins[i]);
> 		if (presence)
> 			break;
>+		if (spec->hp_switch && cfg->hp_pins[i] == nid)
>+			break;
>+		presence = get_hp_pin_presence(codec, cfg->hp_pins[i]);
> 	}
> 
> 	if (presence) {
> 		/* disable lineouts, enable hp */
>+		if (spec->hp_switch)
>+			stac92xx_reset_pinctl(codec, nid, AC_PINCTL_OUT_EN);
> 		for (i = 0; i < cfg->line_outs; i++)
> 			stac92xx_reset_pinctl(codec, cfg->line_out_pins[i],
> 						AC_PINCTL_OUT_EN);
> 		for (i = 0; i < cfg->speaker_outs; i++)
> 			stac92xx_reset_pinctl(codec, cfg->speaker_pins[i],
> 						AC_PINCTL_OUT_EN);
>+		if (spec->eapd_mask)
>+			stac_gpio_set(codec, spec->gpio_mask,
>+				spec->gpio_dir, spec->gpio_data &
>+				~spec->eapd_mask);
> 	} else {
> 		/* enable lineouts, disable hp */
>+		if (spec->hp_switch)
>+			stac92xx_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
> 		for (i = 0; i < cfg->line_outs; i++)
> 			stac92xx_set_pinctl(codec, cfg->line_out_pins[i],
> 						AC_PINCTL_OUT_EN);
> 		for (i = 0; i < cfg->speaker_outs; i++)
> 			stac92xx_set_pinctl(codec, cfg->speaker_pins[i],
> 						AC_PINCTL_OUT_EN);
>+		if (spec->eapd_mask)
>+			stac_gpio_set(codec, spec->gpio_mask,
>+				spec->gpio_dir, spec->gpio_data |
>+				spec->eapd_mask);
> 	}
>+	if (!spec->hp_switch && cfg->hp_outs > 1 && presence)
>+		stac92xx_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
> } 
> 
>+static void stac92xx_pin_sense(struct hda_codec *codec, int idx)
>+{
>+	struct sigmatel_spec *spec = codec->spec;
>+	hda_nid_t nid = spec->pwr_nids[idx];
>+	int presence, val;
>+	val = snd_hda_codec_read(codec, codec->afg, 0, 0x0fec, 0x0)
>+							& 0x000000ff;
>+	presence = get_hp_pin_presence(codec, nid);
>+	idx = 1 << idx;
>+
>+	if (presence)
>+		val &= ~idx;
>+	else
>+		val |= idx;
>+
>+	/* power down unused output ports */
>+	snd_hda_codec_write(codec, codec->afg, 0, 0x7ec, val);
>+};
>+
> static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
> {
>-	switch (res >> 26) {
>+	struct sigmatel_spec *spec = codec->spec;
>+	int idx = res >> 26 & 0x0f;
>+
>+	switch ((res >> 26) & 0x30) {
> 	case STAC_HP_EVENT:
> 		stac92xx_hp_detect(codec, res);
>-		break;
>+		/* fallthru */
>+	case STAC_PWR_EVENT:
>+		if (spec->num_pwrs > 0)
>+			stac92xx_pin_sense(codec, idx);
> 	}
> }
> 
>-#ifdef CONFIG_PM
>+#ifdef SND_HDA_NEEDS_RESUME
> static int stac92xx_resume(struct hda_codec *codec)
> {
> 	struct sigmatel_spec *spec = codec->spec;
>-	int i;
> 
> 	stac92xx_set_config_regs(codec);
>-	if (spec->gpio_mask && spec->gpio_data)
>-	    stac92xx_enable_gpio_mask(codec);
>-	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);
>-
>+	snd_hda_sequence_write(codec, spec->init);
>+	stac_gpio_set(codec, spec->gpio_mask,
>+		spec->gpio_dir, spec->gpio_data);
>+	snd_hda_codec_resume_amp(codec);
>+	snd_hda_codec_resume_cache(codec);
>+	/* power down inactive DACs */
>+	if (spec->dac_list)
>+		stac92xx_power_down(codec);
>+	/* invoke unsolicited event to reset the HP state */
>+	if (spec->hp_detect)
>+		codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
> 	return 0;
> }
> #endif
>@@ -1889,7 +3322,7 @@ static struct hda_codec_ops stac92xx_patch_ops = {
> 	.init = stac92xx_init,
> 	.free = stac92xx_free,
> 	.unsol_event = stac92xx_unsol_event,
>-#ifdef CONFIG_PM
>+#ifdef SND_HDA_NEEDS_RESUME
> 	.resume = stac92xx_resume,
> #endif
> };
>@@ -1929,10 +3362,21 @@ static int patch_stac9200(struct hda_codec *codec)
> 	spec->mux_nids = stac9200_mux_nids;
> 	spec->num_muxes = 1;
> 	spec->num_dmics = 0;
>+	spec->num_adcs = 1;
>+	spec->num_pwrs = 0;
> 
>-	spec->init = stac9200_core_init;
>+	if (spec->board_config == STAC_9200_GATEWAY ||
>+	    spec->board_config == STAC_9200_OQO)
>+		spec->init = stac9200_eapd_init;
>+	else
>+		spec->init = stac9200_core_init;
> 	spec->mixer = stac9200_mixer;
> 
>+	if (spec->board_config == STAC_9200_PANASONIC) {
>+		spec->gpio_mask = spec->gpio_dir = 0x09;
>+		spec->gpio_data = 0x00;
>+	}
>+
> 	err = stac9200_parse_auto_config(codec);
> 	if (err < 0) {
> 		stac92xx_free(codec);
>@@ -1961,7 +3405,8 @@ static int patch_stac925x(struct hda_codec *codec)
> 							stac925x_cfg_tbl);
>  again:
> 	if (spec->board_config < 0) {
>-		snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x, using BIOS defaults\n");
>+		snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x," 
>+				      "using BIOS defaults\n");
> 		err = stac92xx_save_bios_config_regs(codec);
> 		if (err < 0) {
> 			stac92xx_free(codec);
>@@ -1979,7 +3424,22 @@ static int patch_stac925x(struct hda_codec *codec)
> 	spec->adc_nids = stac925x_adc_nids;
> 	spec->mux_nids = stac925x_mux_nids;
> 	spec->num_muxes = 1;
>-	spec->num_dmics = 0;
>+	spec->num_adcs = 1;
>+	spec->num_pwrs = 0;
>+	switch (codec->vendor_id) {
>+	case 0x83847632: /* STAC9202  */
>+	case 0x83847633: /* STAC9202D */
>+	case 0x83847636: /* STAC9251  */
>+	case 0x83847637: /* STAC9251D */
>+		spec->num_dmics = STAC925X_NUM_DMICS;
>+		spec->dmic_nids = stac925x_dmic_nids;
>+		spec->num_dmuxes = ARRAY_SIZE(stac925x_dmux_nids);
>+		spec->dmux_nids = stac925x_dmux_nids;
>+		break;
>+	default:
>+		spec->num_dmics = 0;
>+		break;
>+	}
> 
> 	spec->init = stac925x_core_init;
> 	spec->mixer = stac925x_mixer;
>@@ -2004,6 +3464,237 @@ static int patch_stac925x(struct hda_codec *codec)
> 	return 0;
> }
> 
>+static struct hda_input_mux stac92hd73xx_dmux = {
>+	.num_items = 4,
>+	.items = {
>+		{ "Analog Inputs", 0x0b },
>+		{ "CD", 0x08 },
>+		{ "Digital Mic 1", 0x09 },
>+		{ "Digital Mic 2", 0x0a },
>+	}
>+};
>+
>+static int patch_stac92hd73xx(struct hda_codec *codec)
>+{
>+	struct sigmatel_spec *spec;
>+	hda_nid_t conn[STAC92HD73_DAC_COUNT + 2];
>+	int err = 0;
>+
>+	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
>+	if (spec == NULL)
>+		return -ENOMEM;
>+
>+	codec->spec = spec;
>+	spec->num_pins = ARRAY_SIZE(stac92hd73xx_pin_nids);
>+	spec->pin_nids = stac92hd73xx_pin_nids;
>+	spec->board_config = snd_hda_check_board_config(codec,
>+							STAC_92HD73XX_MODELS,
>+							stac92hd73xx_models,
>+							stac92hd73xx_cfg_tbl);
>+again:
>+	if (spec->board_config < 0) {
>+		snd_printdd(KERN_INFO "hda_codec: Unknown model for"
>+			" STAC92HD73XX, using BIOS defaults\n");
>+		err = stac92xx_save_bios_config_regs(codec);
>+		if (err < 0) {
>+			stac92xx_free(codec);
>+			return err;
>+		}
>+		spec->pin_configs = spec->bios_pin_configs;
>+	} else {
>+		spec->pin_configs = stac92hd73xx_brd_tbl[spec->board_config];
>+		stac92xx_set_config_regs(codec);
>+	}
>+
>+	spec->multiout.num_dacs = snd_hda_get_connections(codec, 0x0a,
>+			conn, STAC92HD73_DAC_COUNT + 2) - 1;
>+
>+	if (spec->multiout.num_dacs < 0) {
>+		printk(KERN_WARNING "hda_codec: Could not determine "
>+		       "number of channels defaulting to DAC count\n");
>+		spec->multiout.num_dacs = STAC92HD73_DAC_COUNT;
>+	}
>+
>+	switch (spec->multiout.num_dacs) {
>+	case 0x3: /* 6 Channel */
>+		spec->multiout.hp_nid = 0x17;
>+		spec->mixer = stac92hd73xx_6ch_mixer;
>+		spec->init = stac92hd73xx_6ch_core_init;
>+		break;
>+	case 0x4: /* 8 Channel */
>+		spec->multiout.hp_nid = 0x18;
>+		spec->mixer = stac92hd73xx_8ch_mixer;
>+		spec->init = stac92hd73xx_8ch_core_init;
>+		break;
>+	case 0x5: /* 10 Channel */
>+		spec->multiout.hp_nid = 0x19;
>+		spec->mixer = stac92hd73xx_10ch_mixer;
>+		spec->init = stac92hd73xx_10ch_core_init;
>+	};
>+
>+	spec->multiout.dac_nids = stac92hd73xx_dac_nids;
>+	spec->aloopback_mask = 0x01;
>+	spec->aloopback_shift = 8;
>+
>+	spec->mux_nids = stac92hd73xx_mux_nids;
>+	spec->adc_nids = stac92hd73xx_adc_nids;
>+	spec->dmic_nids = stac92hd73xx_dmic_nids;
>+	spec->dmux_nids = stac92hd73xx_dmux_nids;
>+
>+	spec->num_muxes = ARRAY_SIZE(stac92hd73xx_mux_nids);
>+	spec->num_adcs = ARRAY_SIZE(stac92hd73xx_adc_nids);
>+	spec->num_dmuxes = ARRAY_SIZE(stac92hd73xx_dmux_nids);
>+	spec->dinput_mux = &stac92hd73xx_dmux;
>+	/* GPIO0 High = Enable EAPD */
>+	spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x1;
>+	spec->gpio_data = 0x01;
>+
>+	switch (spec->board_config) {
>+	case STAC_DELL_M6:
>+		spec->init = dell_eq_core_init;
>+		switch (codec->subsystem_id) {
>+		case 0x1028025e: /* Analog Mics */
>+		case 0x1028025f:
>+			stac92xx_set_config_reg(codec, 0x0b, 0x90A70170);
>+			spec->num_dmics = 0;
>+			break;
>+		case 0x10280271: /* Digital Mics */
>+		case 0x10280272:
>+			spec->init = dell_m6_core_init;
>+			/* fall-through */
>+		case 0x10280254:
>+		case 0x10280255:
>+			stac92xx_set_config_reg(codec, 0x13, 0x90A60160);
>+			spec->num_dmics = 1;
>+			break;
>+		case 0x10280256: /* Both */
>+		case 0x10280057:
>+			stac92xx_set_config_reg(codec, 0x0b, 0x90A70170);
>+			stac92xx_set_config_reg(codec, 0x13, 0x90A60160);
>+			spec->num_dmics = 1;
>+			break;
>+		}
>+		break;
>+	default:
>+		spec->num_dmics = STAC92HD73XX_NUM_DMICS;
>+	}
>+
>+	spec->num_pwrs = ARRAY_SIZE(stac92hd73xx_pwr_nids);
>+	spec->pwr_nids = stac92hd73xx_pwr_nids;
>+
>+	err = stac92xx_parse_auto_config(codec, 0x22, 0x24);
>+
>+	if (!err) {
>+		if (spec->board_config < 0) {
>+			printk(KERN_WARNING "hda_codec: No auto-config is "
>+			       "available, default to model=ref\n");
>+			spec->board_config = STAC_92HD73XX_REF;
>+			goto again;
>+		}
>+		err = -EINVAL;
>+	}
>+
>+	if (err < 0) {
>+		stac92xx_free(codec);
>+		return err;
>+	}
>+
>+	codec->patch_ops = stac92xx_patch_ops;
>+
>+	return 0;
>+}
>+
>+static int patch_stac92hd71bxx(struct hda_codec *codec)
>+{
>+	struct sigmatel_spec *spec;
>+	int err = 0;
>+
>+	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
>+	if (spec == NULL)
>+		return -ENOMEM;
>+
>+	codec->spec = spec;
>+	spec->num_pins = ARRAY_SIZE(stac92hd71bxx_pin_nids);
>+	spec->pin_nids = stac92hd71bxx_pin_nids;
>+	spec->board_config = snd_hda_check_board_config(codec,
>+							STAC_92HD71BXX_MODELS,
>+							stac92hd71bxx_models,
>+							stac92hd71bxx_cfg_tbl);
>+again:
>+	if (spec->board_config < 0) {
>+		snd_printdd(KERN_INFO "hda_codec: Unknown model for"
>+			" STAC92HD71BXX, using BIOS defaults\n");
>+		err = stac92xx_save_bios_config_regs(codec);
>+		if (err < 0) {
>+			stac92xx_free(codec);
>+			return err;
>+		}
>+		spec->pin_configs = spec->bios_pin_configs;
>+	} else {
>+		spec->pin_configs = stac92hd71bxx_brd_tbl[spec->board_config];
>+		stac92xx_set_config_regs(codec);
>+	}
>+
>+	switch (codec->vendor_id) {
>+	case 0x111d76b6: /* 4 Port without Analog Mixer */
>+	case 0x111d76b7:
>+	case 0x111d76b4: /* 6 Port without Analog Mixer */
>+	case 0x111d76b5:
>+		spec->mixer = stac92hd71bxx_mixer;
>+		spec->init = stac92hd71bxx_core_init;
>+		break;
>+	default:
>+		spec->mixer = stac92hd71bxx_analog_mixer;
>+		spec->init = stac92hd71bxx_analog_core_init;
>+	}
>+
>+	spec->aloopback_mask = 0x20;
>+	spec->aloopback_shift = 0;
>+
>+	/* GPIO0 High = EAPD */
>+	spec->gpio_mask = 0x01;
>+	spec->gpio_dir = 0x01;
>+	spec->gpio_mask = 0x01;
>+	spec->gpio_data = 0x01;
>+
>+	spec->mux_nids = stac92hd71bxx_mux_nids;
>+	spec->adc_nids = stac92hd71bxx_adc_nids;
>+	spec->dmic_nids = stac92hd71bxx_dmic_nids;
>+	spec->dmux_nids = stac92hd71bxx_dmux_nids;
>+
>+	spec->num_muxes = ARRAY_SIZE(stac92hd71bxx_mux_nids);
>+	spec->num_adcs = ARRAY_SIZE(stac92hd71bxx_adc_nids);
>+	spec->num_dmics = STAC92HD71BXX_NUM_DMICS;
>+	spec->num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids);
>+
>+	spec->num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids);
>+	spec->pwr_nids = stac92hd71bxx_pwr_nids;
>+
>+	spec->multiout.num_dacs = 1;
>+	spec->multiout.hp_nid = 0x11;
>+	spec->multiout.dac_nids = stac92hd71bxx_dac_nids;
>+
>+	err = stac92xx_parse_auto_config(codec, 0x21, 0x23);
>+	if (!err) {
>+		if (spec->board_config < 0) {
>+			printk(KERN_WARNING "hda_codec: No auto-config is "
>+			       "available, default to model=ref\n");
>+			spec->board_config = STAC_92HD71BXX_REF;
>+			goto again;
>+		}
>+		err = -EINVAL;
>+	}
>+
>+	if (err < 0) {
>+		stac92xx_free(codec);
>+		return err;
>+	}
>+
>+	codec->patch_ops = stac92xx_patch_ops;
>+
>+	return 0;
>+};
>+
> static int patch_stac922x(struct hda_codec *codec)
> {
> 	struct sigmatel_spec *spec;
>@@ -2019,18 +3710,37 @@ static int patch_stac922x(struct hda_codec *codec)
> 	spec->board_config = snd_hda_check_board_config(codec, STAC_922X_MODELS,
> 							stac922x_models,
> 							stac922x_cfg_tbl);
>-	if (spec->board_config == STAC_MACMINI) {
>-		spec->gpio_mute = 1;
>+	if (spec->board_config == STAC_INTEL_MAC_V3) {
>+		spec->gpio_mask = spec->gpio_dir = 0x03;
>+		spec->gpio_data = 0x03;
> 		/* Intel Macs have all same PCI SSID, so we need to check
> 		 * codec SSID to distinguish the exact models
> 		 */
> 		printk(KERN_INFO "hda_codec: STAC922x, Apple subsys_id=%x\n", codec->subsystem_id);
> 		switch (codec->subsystem_id) {
>-		case 0x106b0200: /* MacBook Pro first generation */
>-			spec->board_config = STAC_MACBOOK_PRO_V1;
>+
>+		case 0x106b0800:
>+			spec->board_config = STAC_INTEL_MAC_V1;
>+			break;
>+		case 0x106b0600:
>+		case 0x106b0700:
>+			spec->board_config = STAC_INTEL_MAC_V2;
>+			break;
>+		case 0x106b0e00:
>+		case 0x106b0f00:
>+		case 0x106b1600:
>+		case 0x106b1700:
>+		case 0x106b0200:
>+		case 0x106b1e00:
>+			spec->board_config = STAC_INTEL_MAC_V3;
>+			break;
>+		case 0x106b1a00:
>+		case 0x00000100:
>+			spec->board_config = STAC_INTEL_MAC_V4;
> 			break;
>-		case 0x106b1e00: /* MacBook Pro second generation */
>-			spec->board_config = STAC_MACBOOK_PRO_V2;
>+		case 0x106b0a00:
>+		case 0x106b2200:
>+			spec->board_config = STAC_INTEL_MAC_V5;
> 			break;
> 		}
> 	}
>@@ -2052,8 +3762,10 @@ static int patch_stac922x(struct hda_codec *codec)
> 
> 	spec->adc_nids = stac922x_adc_nids;
> 	spec->mux_nids = stac922x_mux_nids;
>-	spec->num_muxes = 2;
>+	spec->num_muxes = ARRAY_SIZE(stac922x_mux_nids);
>+	spec->num_adcs = ARRAY_SIZE(stac922x_adc_nids);
> 	spec->num_dmics = 0;
>+	spec->num_pwrs = 0;
> 
> 	spec->init = stac922x_core_init;
> 	spec->mixer = stac922x_mixer;
>@@ -2077,6 +3789,13 @@ static int patch_stac922x(struct hda_codec *codec)
> 
> 	codec->patch_ops = stac92xx_patch_ops;
> 
>+	/* Fix Mux capture level; max to 2 */
>+	snd_hda_override_amp_caps(codec, 0x12, HDA_OUTPUT,
>+				  (0 << AC_AMPCAP_OFFSET_SHIFT) |
>+				  (2 << AC_AMPCAP_NUM_STEPS_SHIFT) |
>+				  (0x27 << AC_AMPCAP_STEP_SIZE_SHIFT) |
>+				  (0 << AC_AMPCAP_MUTE_SHIFT));
>+
> 	return 0;
> }
> 
>@@ -2090,55 +3809,85 @@ static int patch_stac927x(struct hda_codec *codec)
> 		return -ENOMEM;
> 
> 	codec->spec = spec;
>-	spec->num_pins = ARRAY_SIZE(stac927x_pin_nids); 
>+	spec->num_pins = ARRAY_SIZE(stac927x_pin_nids);
> 	spec->pin_nids = stac927x_pin_nids;
> 	spec->board_config = snd_hda_check_board_config(codec, STAC_927X_MODELS,
> 							stac927x_models,
> 							stac927x_cfg_tbl);
>  again:
>-	if (spec->board_config < 0) {
>-                snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC927x, using BIOS defaults\n");
>+	if (spec->board_config < 0 || !stac927x_brd_tbl[spec->board_config]) {
>+		if (spec->board_config < 0)
>+			snd_printdd(KERN_INFO "hda_codec: Unknown model for"
>+				    "STAC927x, using BIOS defaults\n");
> 		err = stac92xx_save_bios_config_regs(codec);
> 		if (err < 0) {
> 			stac92xx_free(codec);
> 			return err;
> 		}
> 		spec->pin_configs = spec->bios_pin_configs;
>-	} else if (stac927x_brd_tbl[spec->board_config] != NULL) {
>+	} else {
> 		spec->pin_configs = stac927x_brd_tbl[spec->board_config];
> 		stac92xx_set_config_regs(codec);
> 	}
> 
>+	spec->adc_nids = stac927x_adc_nids;
>+	spec->num_adcs = ARRAY_SIZE(stac927x_adc_nids);
>+	spec->mux_nids = stac927x_mux_nids;
>+	spec->num_muxes = ARRAY_SIZE(stac927x_mux_nids);
>+	spec->dac_list = stac927x_dac_nids;
>+	spec->multiout.dac_nids = spec->dac_nids;
>+
> 	switch (spec->board_config) {
> 	case STAC_D965_3ST:
>-		spec->adc_nids = stac927x_adc_nids;
>-		spec->mux_nids = stac927x_mux_nids;
>-		spec->num_muxes = 3;
>+	case STAC_D965_5ST:
>+		/* GPIO0 High = Enable EAPD */
>+		spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x01;
>+		spec->gpio_data = 0x01;
> 		spec->num_dmics = 0;
>+
> 		spec->init = d965_core_init;
>-		spec->mixer = stac9227_mixer;
>+		spec->mixer = stac927x_mixer;
> 		break;
>-	case STAC_D965_5ST:
>-		spec->adc_nids = stac927x_adc_nids;
>-		spec->mux_nids = stac927x_mux_nids;
>-		spec->num_muxes = 3;
>-		spec->num_dmics = 0;
>+	case STAC_DELL_BIOS:
>+		switch (codec->subsystem_id) {
>+		case 0x10280209:
>+		case 0x1028022e:
>+			/* correct the device field to SPDIF out */
>+			stac92xx_set_config_reg(codec, 0x21, 0x01442070);
>+			break;
>+		};
>+		/* configure the analog microphone on some laptops */
>+		stac92xx_set_config_reg(codec, 0x0c, 0x90a79130);
>+		/* correct the front output jack as a hp out */
>+		stac92xx_set_config_reg(codec, 0x0f, 0x0227011f);
>+		/* correct the front input jack as a mic */
>+		stac92xx_set_config_reg(codec, 0x0e, 0x02a79130);
>+		/* fallthru */
>+	case STAC_DELL_3ST:
>+		/* GPIO2 High = Enable EAPD */
>+		spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x04;
>+		spec->gpio_data = 0x04;
>+		spec->dmic_nids = stac927x_dmic_nids;
>+		spec->num_dmics = STAC927X_NUM_DMICS;
>+
> 		spec->init = d965_core_init;
>-		spec->mixer = stac9227_mixer;
>+		spec->mixer = stac927x_mixer;
>+		spec->dmux_nids = stac927x_dmux_nids;
>+		spec->num_dmuxes = ARRAY_SIZE(stac927x_dmux_nids);
> 		break;
> 	default:
>-		spec->adc_nids = stac927x_adc_nids;
>-		spec->mux_nids = stac927x_mux_nids;
>-		spec->num_muxes = 3;
>+		/* GPIO0 High = Enable EAPD */
>+		spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x1;
>+		spec->gpio_data = 0x01;
> 		spec->num_dmics = 0;
>+
> 		spec->init = stac927x_core_init;
> 		spec->mixer = stac927x_mixer;
> 	}
> 
>-	spec->multiout.dac_nids = spec->dac_nids;
>-	/* GPIO0 High = Enable EAPD */
>-	spec->gpio_mask = spec->gpio_data = 0x00000001;
>-	stac92xx_enable_gpio_mask(codec);
>+	spec->num_pwrs = 0;
>+	spec->aloopback_mask = 0x40;
>+	spec->aloopback_shift = 0;
> 
> 	err = stac92xx_parse_auto_config(codec, 0x1e, 0x20);
> 	if (!err) {
>@@ -2157,6 +3906,18 @@ static int patch_stac927x(struct hda_codec *codec)
> 
> 	codec->patch_ops = stac92xx_patch_ops;
> 
>+	/*
>+	 * !!FIXME!!
>+	 * The STAC927x seem to require fairly long delays for certain
>+	 * command sequences.  With too short delays (even if the answer
>+	 * is set to RIRB properly), it results in the silence output
>+	 * on some hardwares like Dell.
>+	 *
>+	 * The below flag enables the longer delay (see get_response
>+	 * in hda_intel.c).
>+	 */
>+	codec->bus->needs_damn_long_delay = 1;
>+
> 	return 0;
> }
> 
>@@ -2190,36 +3951,51 @@ static int patch_stac9205(struct hda_codec *codec)
> 	}
> 
> 	spec->adc_nids = stac9205_adc_nids;
>+	spec->num_adcs = ARRAY_SIZE(stac9205_adc_nids);
> 	spec->mux_nids = stac9205_mux_nids;
>-	spec->num_muxes = 2;
>+	spec->num_muxes = ARRAY_SIZE(stac9205_mux_nids);
> 	spec->dmic_nids = stac9205_dmic_nids;
>-	spec->num_dmics = 2;
>-	spec->dmux_nid = 0x1d;
>+	spec->num_dmics = STAC9205_NUM_DMICS;
>+	spec->dmux_nids = stac9205_dmux_nids;
>+	spec->num_dmuxes = ARRAY_SIZE(stac9205_dmux_nids);
>+	spec->num_pwrs = 0;
> 
> 	spec->init = stac9205_core_init;
> 	spec->mixer = stac9205_mixer;
> 
>+	spec->aloopback_mask = 0x40;
>+	spec->aloopback_shift = 0;
> 	spec->multiout.dac_nids = spec->dac_nids;
>-
>-	switch (spec->board_config) {
>+	
>+	switch (spec->board_config){
> 	case STAC_9205_DELL_M43:
>-	    /* Enable SPDIF in/out */
>-	    stac92xx_set_config_reg(codec, 0x1f, 0x01441030);
>-	    stac92xx_set_config_reg(codec, 0x20, 0x1c410030);
>-
>-	    spec->gpio_mask = 0x0000000b; /* GPIO0-2 */
>-	    /* GPIO0 High = EAPD, GPIO1 Low = DRM,
>-	     * GPIO2 High = Headphone Mute
>-	     */
>-	    spec->gpio_data = 0x00000005;
>-	    break;
>+		/* Enable SPDIF in/out */
>+		stac92xx_set_config_reg(codec, 0x1f, 0x01441030);
>+		stac92xx_set_config_reg(codec, 0x20, 0x1c410030);
>+
>+		/* Enable unsol response for GPIO4/Dock HP connection */
>+		snd_hda_codec_write(codec, codec->afg, 0,
>+			AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x10);
>+		snd_hda_codec_write_cache(codec, codec->afg, 0,
>+					  AC_VERB_SET_UNSOLICITED_ENABLE,
>+					  (AC_USRSP_EN | STAC_HP_EVENT));
>+
>+		spec->gpio_dir = 0x0b;
>+		spec->eapd_mask = 0x01;
>+		spec->gpio_mask = 0x1b;
>+		spec->gpio_mute = 0x10;
>+		/* GPIO0 High = EAPD, GPIO1 Low = Headphone Mute,
>+		 * GPIO3 Low = DRM
>+		 */
>+		spec->gpio_data = 0x01;
>+		break;
> 	default:
>-	    /* GPIO0 High = EAPD */
>-	    spec->gpio_mask = spec->gpio_data = 0x00000001;
>-	    break;
>-	} 
>+		/* GPIO0 High = EAPD */
>+		spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x1;
>+		spec->gpio_data = 0x01;
>+		break;
>+	}
> 
>-	stac92xx_enable_gpio_mask(codec);
> 	err = stac92xx_parse_auto_config(codec, 0x1f, 0x20);
> 	if (!err) {
> 		if (spec->board_config < 0) {
>@@ -2251,22 +4027,23 @@ static hda_nid_t vaio_adcs[] = { 0x8 /*,0x6*/ };
> static hda_nid_t vaio_mux_nids[] = { 0x15 };
> 
> static struct hda_input_mux vaio_mux = {
>-	.num_items = 2,
>+	.num_items = 3,
> 	.items = {
> 		/* { "HP", 0x0 }, */
>-		{ "Line", 0x1 },
>-		{ "Mic", 0x2 },
>+		{ "Mic Jack", 0x1 },
>+		{ "Internal Mic", 0x2 },
> 		{ "PCM", 0x3 },
> 	}
> };
> 
> static struct hda_verb vaio_init[] = {
> 	{0x0a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP }, /* HP <- 0x2 */
>+	{0x0a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | STAC_HP_EVENT},
> 	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* Speaker <- 0x5 */
> 	{0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? (<- 0x2) */
> 	{0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, /* CD */
> 	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? */
>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x2}, /* mic-sel: 0a,0d,14,02 */
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x1}, /* mic-sel: 0a,0d,14,02 */
> 	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* HP */
> 	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Speaker */
> 	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* capture sw/vol -> 0x8 */
>@@ -2282,7 +4059,7 @@ static struct hda_verb vaio_ar_init[] = {
> 	{0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, /* CD */
> /*	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },*/ /* Optical Out */
> 	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? */
>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x2}, /* mic-sel: 0a,0d,14,02 */
>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x1}, /* mic-sel: 0a,0d,14,02 */
> 	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* HP */
> 	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Speaker */
> /*	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},*/ /* Optical Out */
>@@ -2293,61 +4070,28 @@ static struct hda_verb vaio_ar_init[] = {
> };
> 
> /* bind volumes of both NID 0x02 and 0x05 */
>-static int vaio_master_vol_put(struct snd_kcontrol *kcontrol,
>-			       struct snd_ctl_elem_value *ucontrol)
>-{
>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>-	long *valp = ucontrol->value.integer.value;
>-	int change;
>-
>-	change = snd_hda_codec_amp_update(codec, 0x02, 0, HDA_OUTPUT, 0,
>-					  0x7f, valp[0] & 0x7f);
>-	change |= snd_hda_codec_amp_update(codec, 0x02, 1, HDA_OUTPUT, 0,
>-					   0x7f, valp[1] & 0x7f);
>-	snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
>-				 0x7f, valp[0] & 0x7f);
>-	snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
>-				 0x7f, valp[1] & 0x7f);
>-	return change;
>-}
>+static struct hda_bind_ctls vaio_bind_master_vol = {
>+	.ops = &snd_hda_bind_vol,
>+	.values = {
>+		HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
>+		HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
>+		0
>+	},
>+};
> 
> /* bind volumes of both NID 0x02 and 0x05 */
>-static int vaio_master_sw_put(struct snd_kcontrol *kcontrol,
>-			      struct snd_ctl_elem_value *ucontrol)
>-{
>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
>-	long *valp = ucontrol->value.integer.value;
>-	int change;
>-
>-	change = snd_hda_codec_amp_update(codec, 0x02, 0, HDA_OUTPUT, 0,
>-					  0x80, (valp[0] ? 0 : 0x80));
>-	change |= snd_hda_codec_amp_update(codec, 0x02, 1, HDA_OUTPUT, 0,
>-					   0x80, (valp[1] ? 0 : 0x80));
>-	snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
>-				 0x80, (valp[0] ? 0 : 0x80));
>-	snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
>-				 0x80, (valp[1] ? 0 : 0x80));
>-	return change;
>-}
>+static struct hda_bind_ctls vaio_bind_master_sw = {
>+	.ops = &snd_hda_bind_sw,
>+	.values = {
>+		HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
>+		HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
>+		0,
>+	},
>+};
> 
> static struct snd_kcontrol_new vaio_mixer[] = {
>-	{
>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Master Playback Volume",
>-		.info = snd_hda_mixer_amp_volume_info,
>-		.get = snd_hda_mixer_amp_volume_get,
>-		.put = vaio_master_vol_put,
>-		.tlv = { .c = snd_hda_mixer_amp_tlv },
>-		.private_value = HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
>-	},
>-	{
>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Master Playback Switch",
>-		.info = snd_hda_mixer_amp_switch_info,
>-		.get = snd_hda_mixer_amp_switch_get,
>-		.put = vaio_master_sw_put,
>-		.private_value = HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
>-	},
>+	HDA_BIND_VOL("Master Playback Volume", &vaio_bind_master_vol),
>+	HDA_BIND_SW("Master Playback Switch", &vaio_bind_master_sw),
> 	/* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */
> 	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
> 	HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT),
>@@ -2363,22 +4107,8 @@ static struct snd_kcontrol_new vaio_mixer[] = {
> };
> 
> static struct snd_kcontrol_new vaio_ar_mixer[] = {
>-	{
>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Master Playback Volume",
>-		.info = snd_hda_mixer_amp_volume_info,
>-		.get = snd_hda_mixer_amp_volume_get,
>-		.put = vaio_master_vol_put,
>-		.private_value = HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
>-	},
>-	{
>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>-		.name = "Master Playback Switch",
>-		.info = snd_hda_mixer_amp_switch_info,
>-		.get = snd_hda_mixer_amp_switch_get,
>-		.put = vaio_master_sw_put,
>-		.private_value = HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
>-	},
>+	HDA_BIND_VOL("Master Playback Volume", &vaio_bind_master_vol),
>+	HDA_BIND_SW("Master Playback Switch", &vaio_bind_master_sw),
> 	/* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */
> 	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
> 	HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT),
>@@ -2400,6 +4130,49 @@ static struct hda_codec_ops stac9872_patch_ops = {
> 	.build_pcms = stac92xx_build_pcms,
> 	.init = stac92xx_init,
> 	.free = stac92xx_free,
>+#ifdef SND_HDA_NEEDS_RESUME
>+	.resume = stac92xx_resume,
>+#endif
>+};
>+
>+static int stac9872_vaio_init(struct hda_codec *codec)
>+{
>+	int err;
>+
>+	err = stac92xx_init(codec);
>+	if (err < 0)
>+		return err;
>+	if (codec->patch_ops.unsol_event)
>+		codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
>+	return 0;
>+}
>+
>+static void stac9872_vaio_hp_detect(struct hda_codec *codec, unsigned int res)
>+{
>+	if (get_hp_pin_presence(codec, 0x0a)) {
>+		stac92xx_reset_pinctl(codec, 0x0f, AC_PINCTL_OUT_EN);
>+		stac92xx_set_pinctl(codec, 0x0a, AC_PINCTL_OUT_EN);
>+	} else {
>+		stac92xx_reset_pinctl(codec, 0x0a, AC_PINCTL_OUT_EN);
>+		stac92xx_set_pinctl(codec, 0x0f, AC_PINCTL_OUT_EN);
>+	}
>+} 
>+
>+static void stac9872_vaio_unsol_event(struct hda_codec *codec, unsigned int res)
>+{
>+	switch (res >> 26) {
>+	case STAC_HP_EVENT:
>+		stac9872_vaio_hp_detect(codec, res);
>+		break;
>+	}
>+}
>+
>+static struct hda_codec_ops stac9872_vaio_patch_ops = {
>+	.build_controls = stac92xx_build_controls,
>+	.build_pcms = stac92xx_build_pcms,
>+	.init = stac9872_vaio_init,
>+	.free = stac92xx_free,
>+	.unsol_event = stac9872_vaio_unsol_event,
> #ifdef CONFIG_PM
> 	.resume = stac92xx_resume,
> #endif
>@@ -2425,6 +4198,7 @@ static struct snd_pci_quirk stac9872_cfg_tbl[] = {
> 	SND_PCI_QUIRK(0x104d, 0x81e6, "Sony VAIO F/S", CXD9872RD_VAIO),
> 	SND_PCI_QUIRK(0x104d, 0x81ef, "Sony VAIO F/S", CXD9872RD_VAIO),
> 	SND_PCI_QUIRK(0x104d, 0x81fd, "Sony VAIO AR", CXD9872AKD_VAIO),
>+	SND_PCI_QUIRK(0x104d, 0x8205, "Sony VAIO AR", CXD9872AKD_VAIO),
> 	{}
> };
> 
>@@ -2457,8 +4231,10 @@ static int patch_stac9872(struct hda_codec *codec)
> 		spec->multiout.hp_nid = VAIO_HP_DAC;
> 		spec->num_adcs = ARRAY_SIZE(vaio_adcs);
> 		spec->adc_nids = vaio_adcs;
>+		spec->num_pwrs = 0;
> 		spec->input_mux = &vaio_mux;
> 		spec->mux_nids = vaio_mux_nids;
>+		codec->patch_ops = stac9872_vaio_patch_ops;
> 		break;
> 	
> 	case CXD9872AKD_VAIO:
>@@ -2469,13 +4245,14 @@ static int patch_stac9872(struct hda_codec *codec)
> 		spec->multiout.dac_nids = vaio_dacs;
> 		spec->multiout.hp_nid = VAIO_HP_DAC;
> 		spec->num_adcs = ARRAY_SIZE(vaio_adcs);
>+		spec->num_pwrs = 0;
> 		spec->adc_nids = vaio_adcs;
> 		spec->input_mux = &vaio_mux;
> 		spec->mux_nids = vaio_mux_nids;
>+		codec->patch_ops = stac9872_patch_ops;
> 		break;
> 	}
> 
>-	codec->patch_ops = stac9872_patch_ops;
> 	return 0;
> }
> 
>@@ -2513,6 +4290,8 @@ struct hda_codec_preset snd_hda_preset_sigmatel[] = {
> 	{ .id = 0x83847635, .name = "STAC9250D", .patch = patch_stac925x },
> 	{ .id = 0x83847636, .name = "STAC9251", .patch = patch_stac925x },
> 	{ .id = 0x83847637, .name = "STAC9250D", .patch = patch_stac925x },
>+	{ .id = 0x83847645, .name = "92HD206X", .patch = patch_stac927x },
>+	{ .id = 0x83847646, .name = "92HD206D", .patch = patch_stac927x },
>  	/* The following does not take into account .id=0x83847661 when subsys =
>  	 * 104D0C00 which is STAC9225s. Because of this, some SZ Notebooks are
>  	 * currently not fully supported.
>@@ -2528,5 +4307,17 @@ struct hda_codec_preset snd_hda_preset_sigmatel[] = {
>  	{ .id = 0x838476a5, .name = "STAC9255D", .patch = patch_stac9205 },
>  	{ .id = 0x838476a6, .name = "STAC9254", .patch = patch_stac9205 },
>  	{ .id = 0x838476a7, .name = "STAC9254D", .patch = patch_stac9205 },
>+	{ .id = 0x111d7674, .name = "92HD73D1X5", .patch = patch_stac92hd73xx },
>+	{ .id = 0x111d7675, .name = "92HD73C1X5", .patch = patch_stac92hd73xx },
>+	{ .id = 0x111d7676, .name = "92HD73E1X5", .patch = patch_stac92hd73xx },
>+	{ .id = 0x111d7608, .name = "92HD71BXX", .patch = patch_stac92hd71bxx },
>+	{ .id = 0x111d76b0, .name = "92HD71B8X", .patch = patch_stac92hd71bxx },
>+	{ .id = 0x111d76b1, .name = "92HD71B8X", .patch = patch_stac92hd71bxx },
>+	{ .id = 0x111d76b2, .name = "92HD71B7X", .patch = patch_stac92hd71bxx },
>+	{ .id = 0x111d76b3, .name = "92HD71B7X", .patch = patch_stac92hd71bxx },
>+	{ .id = 0x111d76b4, .name = "92HD71B6X", .patch = patch_stac92hd71bxx },
>+	{ .id = 0x111d76b5, .name = "92HD71B6X", .patch = patch_stac92hd71bxx },
>+	{ .id = 0x111d76b6, .name = "92HD71B5X", .patch = patch_stac92hd71bxx },
>+	{ .id = 0x111d76b7, .name = "92HD71B5X", .patch = patch_stac92hd71bxx },
> 	{} /* terminator */
> };
>diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
>index 4c839b0..9ebbe68 100644
>--- a/sound/pci/hda/patch_via.c
>+++ b/sound/pci/hda/patch_via.c
>@@ -27,6 +27,8 @@
> /* 2006-03-14  Lydia Wang  Modify hard code for some pin widget nid          */
> /* 2006-08-02  Lydia Wang  Add support to VT1709 codec                       */
> /* 2006-09-08  Lydia Wang  Fix internal loopback recording source select bug */
>+/* 2007-09-12  Lydia Wang  Add EAPD enable during driver initialization      */
>+/* 2007-09-17  Lydia Wang  Add VT1708B codec support                        */
> /*                                                                           */
> /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
> 
>@@ -35,11 +37,10 @@
> #include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/slab.h>
>-#include <linux/pci.h>
> #include <sound/core.h>
> #include "hda_codec.h"
> #include "hda_local.h"
>-
>+#include "hda_patch.h"
> 
> /* amp values */
> #define AMP_VAL_IDX_SHIFT	19
>@@ -52,14 +53,23 @@
> #define VT1708_HP_NID		0x13
> #define VT1708_DIGOUT_NID	0x14
> #define VT1708_DIGIN_NID	0x16
>+#define VT1708_DIGIN_PIN	0x26
> 
> #define VT1709_HP_DAC_NID	0x28
> #define VT1709_DIGOUT_NID	0x13
> #define VT1709_DIGIN_NID	0x17
>+#define VT1709_DIGIN_PIN	0x25
>+
>+#define VT1708B_HP_NID		0x25
>+#define VT1708B_DIGOUT_NID	0x12
>+#define VT1708B_DIGIN_NID	0x15
>+#define VT1708B_DIGIN_PIN	0x21
> 
> #define IS_VT1708_VENDORID(x)		((x) >= 0x11061708 && (x) <= 0x1106170b)
> #define IS_VT1709_10CH_VENDORID(x)	((x) >= 0x1106e710 && (x) <= 0x1106e713)
> #define IS_VT1709_6CH_VENDORID(x)	((x) >= 0x1106e714 && (x) <= 0x1106e717)
>+#define IS_VT1708B_8CH_VENDORID(x)	((x) >= 0x1106e720 && (x) <= 0x1106e723)
>+#define IS_VT1708B_4CH_VENDORID(x)	((x) >= 0x1106e724 && (x) <= 0x1106e727)
> 
> 
> enum {
>@@ -115,7 +125,11 @@ struct via_spec {
> 	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];	
>+	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	struct hda_loopback_check loopback;
>+#endif
> };
> 
> static hda_nid_t vt1708_adc_nids[2] = {
>@@ -128,6 +142,11 @@ static hda_nid_t vt1709_adc_nids[3] = {
> 	0x14, 0x15, 0x16
> };
> 
>+static hda_nid_t vt1708B_adc_nids[2] = {
>+	/* ADC1-2 */
>+	0x13, 0x14
>+};
>+
> /* add dynamic controls */
> static int via_add_control(struct via_spec *spec, int type, const char *name,
> 			   unsigned long val)
>@@ -265,9 +284,13 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
> 		return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
> 					     0x18, &spec->cur_mux[adc_idx]);
> 	else if ((IS_VT1709_10CH_VENDORID(vendor_id) ||
>-		  IS_VT1709_6CH_VENDORID(vendor_id)) && (adc_idx == 0) )
>+		  IS_VT1709_6CH_VENDORID(vendor_id)) && adc_idx == 0)
> 		return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
> 					     0x19, &spec->cur_mux[adc_idx]);
>+	else if ((IS_VT1708B_8CH_VENDORID(vendor_id) ||
>+		  IS_VT1708B_4CH_VENDORID(vendor_id)) && adc_idx == 0)
>+		return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
>+					     0x17, &spec->cur_mux[adc_idx]);
> 	else
> 		return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
> 					     spec->adc_nids[adc_idx],
>@@ -284,7 +307,6 @@ static struct snd_kcontrol_new vt1708_capture_mixer[] = {
> 		.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",
>@@ -326,10 +348,9 @@ static struct hda_verb vt1708_volume_init_verbs[] = {
> 	
> 	/* Setup default input to PW4 */
> 	{0x20, AC_VERB_SET_CONNECT_SEL, 0x1},
>-	/* Set mic as default input of sw0 */
>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x2},
> 	/* PW9 Output enable */
> 	{0x25, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
>+	{ }
> };
> 
> static int via_playback_pcm_open(struct hda_pcm_stream *hinfo,
>@@ -337,7 +358,8 @@ static int via_playback_pcm_open(struct hda_pcm_stream *hinfo,
> 				 struct snd_pcm_substream *substream)
> {
> 	struct via_spec *spec = codec->spec;
>-	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
>+	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
>+					     hinfo);
> }
> 
> static int via_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
>@@ -378,6 +400,17 @@ static int via_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
> 	return snd_hda_multi_out_dig_close(codec, &spec->multiout);
> }
> 
>+static int via_dig_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 via_spec *spec = codec->spec;
>+	return snd_hda_multi_out_dig_prepare(codec, &spec->multiout,
>+					     stream_tag, format, substream);
>+}
>+
> /*
>  * Analog capture
>  */
>@@ -399,8 +432,7 @@ static int via_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
> 				   struct snd_pcm_substream *substream)
> {
> 	struct via_spec *spec = codec->spec;
>-	snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
>-				   0, 0, 0);
>+	snd_hda_codec_cleanup_stream(codec, spec->adc_nids[substream->number]);
> 	return 0;
> }
> 
>@@ -416,6 +448,23 @@ static struct hda_pcm_stream vt1708_pcm_analog_playback = {
> 	},
> };
> 
>+static struct hda_pcm_stream vt1708_pcm_analog_s16_playback = {
>+	.substreams = 1,
>+	.channels_min = 2,
>+	.channels_max = 8,
>+	.nid = 0x10, /* NID to query formats and rates */
>+	/* We got noisy outputs on the right channel on VT1708 when
>+	 * 24bit samples are used.  Until any workaround is found,
>+	 * disable the 24bit format, so far.
>+	 */
>+	.formats = SNDRV_PCM_FMTBIT_S16_LE,
>+	.ops = {
>+		.open = via_playback_pcm_open,
>+		.prepare = via_playback_pcm_prepare,
>+		.cleanup = via_playback_pcm_cleanup
>+	},
>+};
>+
> static struct hda_pcm_stream vt1708_pcm_analog_capture = {
> 	.substreams = 2,
> 	.channels_min = 2,
>@@ -434,7 +483,8 @@ static struct hda_pcm_stream vt1708_pcm_digital_playback = {
> 	/* NID is set in via_build_pcms */
> 	.ops = {
> 		.open = via_dig_playback_pcm_open,
>-		.close = via_dig_playback_pcm_close
>+		.close = via_dig_playback_pcm_close,
>+		.prepare = via_dig_playback_pcm_prepare
> 	},
> };
> 
>@@ -461,6 +511,11 @@ static int via_build_controls(struct hda_codec *codec)
> 						    spec->multiout.dig_out_nid);
> 		if (err < 0)
> 			return err;
>+		err = snd_hda_create_spdif_share_sw(codec,
>+						    &spec->multiout);
>+		if (err < 0)
>+			return err;
>+		spec->multiout.share_spdif = 1;
> 	}
> 	if (spec->dig_in_nid) {
> 		err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
>@@ -491,6 +546,7 @@ static int via_build_pcms(struct hda_codec *codec)
> 		codec->num_pcms++;
> 		info++;
> 		info->name = spec->stream_name_digital;
>+		info->pcm_type = HDA_PCM_TYPE_SPDIF;
> 		if (spec->multiout.dig_out_nid) {
> 			info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
> 				*(spec->stream_digital_playback);
>@@ -529,27 +585,41 @@ static int via_init(struct hda_codec *codec)
> {
> 	struct via_spec *spec = codec->spec;
> 	snd_hda_sequence_write(codec, spec->init_verbs);
>+	/* Lydia Add for EAPD enable */
>+	if (!spec->dig_in_nid) { /* No Digital In connection */
>+		if (IS_VT1708_VENDORID(codec->vendor_id)) {
>+			snd_hda_codec_write(codec, VT1708_DIGIN_PIN, 0,
>+					    AC_VERB_SET_PIN_WIDGET_CONTROL,
>+					    PIN_OUT);
>+			snd_hda_codec_write(codec, VT1708_DIGIN_PIN, 0,
>+					    AC_VERB_SET_EAPD_BTLENABLE, 0x02);
>+		} else if (IS_VT1709_10CH_VENDORID(codec->vendor_id) ||
>+			   IS_VT1709_6CH_VENDORID(codec->vendor_id)) {
>+			snd_hda_codec_write(codec, VT1709_DIGIN_PIN, 0,
>+					    AC_VERB_SET_PIN_WIDGET_CONTROL,
>+					    PIN_OUT);
>+			snd_hda_codec_write(codec, VT1709_DIGIN_PIN, 0,
>+					    AC_VERB_SET_EAPD_BTLENABLE, 0x02);
>+		} else if (IS_VT1708B_8CH_VENDORID(codec->vendor_id) ||
>+			   IS_VT1708B_4CH_VENDORID(codec->vendor_id)) {
>+			snd_hda_codec_write(codec, VT1708B_DIGIN_PIN, 0,
>+					    AC_VERB_SET_PIN_WIDGET_CONTROL,
>+					    PIN_OUT);
>+			snd_hda_codec_write(codec, VT1708B_DIGIN_PIN, 0,
>+					    AC_VERB_SET_EAPD_BTLENABLE, 0x02);
>+		}
>+	} else /* enable SPDIF-input pin */
>+		snd_hda_codec_write(codec, spec->autocfg.dig_in_pin, 0,
>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN);
>+
>  	return 0;
> }
> 
>-#ifdef CONFIG_PM
>-/*
>- * resume
>- */
>-static int via_resume(struct hda_codec *codec)
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid)
> {
> 	struct via_spec *spec = codec->spec;
>-	int i;
>-
>-	via_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;
>+	return snd_hda_check_amp_list_power(codec, &spec->loopback, nid);
> }
> #endif
> 
>@@ -560,8 +630,8 @@ static struct hda_codec_ops via_patch_ops = {
> 	.build_pcms = via_build_pcms,
> 	.init = via_init,
> 	.free = via_free,
>-#ifdef CONFIG_PM
>-	.resume = via_resume,
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	.check_power_status = via_check_power_status,
> #endif
> };
> 
>@@ -621,58 +691,68 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
> 		if (i == AUTO_SEQ_CENLFE) {
> 			/* Center/LFE */
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
>-					      "Center Playback Volume",
>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0, HDA_OUTPUT));
>+					"Center Playback Volume",
>+					HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,
>+							    HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
> 					      "LFE Playback Volume",
>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
> 					      "Center Playback Switch",
>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
> 					      "LFE Playback Switch",
>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 		} else if (i == AUTO_SEQ_FRONT){
> 			/* add control to mixer index 0 */
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
> 					      "Master Front Playback Volume",
>-					      HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_INPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x17, 3, 0,
>+								  HDA_INPUT));
> 			if (err < 0)
> 				return err;
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
> 					      "Master Front Playback Switch",
>-					      HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_INPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x17, 3, 0,
>+								  HDA_INPUT));
> 			if (err < 0)
> 				return err;
> 			
> 			/* add control to PW3 */
> 			sprintf(name, "%s Playback Volume", chname[i]);
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
>-					      HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			sprintf(name, "%s Playback Switch", chname[i]);
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
>-					      HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 		} else {
> 			sprintf(name, "%s Playback Volume", chname[i]);
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			sprintf(name, "%s Playback Switch", chname[i]);
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 		}
>@@ -751,6 +831,16 @@ static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec,
> 	return 0;
> }
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list vt1708_loopbacks[] = {
>+	{ 0x17, HDA_INPUT, 1 },
>+	{ 0x17, HDA_INPUT, 2 },
>+	{ 0x17, HDA_INPUT, 3 },
>+	{ 0x17, HDA_INPUT, 4 },
>+	{ } /* end */
>+};
>+#endif
>+
> static int vt1708_parse_auto_config(struct hda_codec *codec)
> {
> 	struct via_spec *spec = codec->spec;
>@@ -827,6 +917,9 @@ static int patch_vt1708(struct hda_codec *codec)
> 	
> 	spec->stream_name_analog = "VT1708 Analog";
> 	spec->stream_analog_playback = &vt1708_pcm_analog_playback;
>+	/* disable 32bit format on VT1708 */
>+	if (codec->vendor_id == 0x11061708)
>+		spec->stream_analog_playback = &vt1708_pcm_analog_s16_playback;
> 	spec->stream_analog_capture = &vt1708_pcm_analog_capture;
> 
> 	spec->stream_name_digital = "VT1708 Digital";
>@@ -844,6 +937,9 @@ static int patch_vt1708(struct hda_codec *codec)
> 	codec->patch_ops = via_patch_ops;
> 
> 	codec->patch_ops.init = via_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = vt1708_loopbacks;
>+#endif
> 
> 	return 0;
> }
>@@ -860,7 +956,6 @@ static struct snd_kcontrol_new vt1709_capture_mixer[] = {
> 		.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",
>@@ -910,8 +1005,6 @@ static struct hda_verb vt1709_10ch_volume_init_verbs[] = {
> 
> 	/* Set input of PW4 as AOW4 */
> 	{0x20, AC_VERB_SET_CONNECT_SEL, 0x1},
>-	/* Set mic as default input of sw0 */
>-	{0x19, AC_VERB_SET_CONNECT_SEL, 0x2},
> 	/* PW9 Output enable */
> 	{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
> 	{ }
>@@ -1058,68 +1151,80 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
> 			/* Center/LFE */
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
> 					      "Center Playback Volume",
>-					      HDA_COMPOSE_AMP_VAL(0x1b, 1, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x1b, 1, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
> 					      "LFE Playback Volume",
>-					      HDA_COMPOSE_AMP_VAL(0x1b, 2, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x1b, 2, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
> 					      "Center Playback Switch",
>-					      HDA_COMPOSE_AMP_VAL(0x1b, 1, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x1b, 1, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
> 					      "LFE Playback Switch",
>-					      HDA_COMPOSE_AMP_VAL(0x1b, 2, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x1b, 2, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 		} else if (i == AUTO_SEQ_FRONT){
> 			/* add control to mixer index 0 */
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
> 					      "Master Front Playback Volume",
>-					      HDA_COMPOSE_AMP_VAL(0x18, 3, 0, HDA_INPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x18, 3, 0,
>+								  HDA_INPUT));
> 			if (err < 0)
> 				return err;
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
> 					      "Master Front Playback Switch",
>-					      HDA_COMPOSE_AMP_VAL(0x18, 3, 0, HDA_INPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x18, 3, 0,
>+								  HDA_INPUT));
> 			if (err < 0)
> 				return err;
> 			
> 			/* add control to PW3 */
> 			sprintf(name, "%s Playback Volume", chname[i]);
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
>-					      HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			sprintf(name, "%s Playback Switch", chname[i]);
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
>-					      HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 		} else if (i == AUTO_SEQ_SURROUND) {
> 			sprintf(name, "%s Playback Volume", chname[i]);
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
>-					      HDA_COMPOSE_AMP_VAL(0x29, 3, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x29, 3, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			sprintf(name, "%s Playback Switch", chname[i]);
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
>-					      HDA_COMPOSE_AMP_VAL(0x29, 3, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x29, 3, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 		} else if (i == AUTO_SEQ_SIDE) {
> 			sprintf(name, "%s Playback Volume", chname[i]);
> 			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
>-					      HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x1a, 3, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 			sprintf(name, "%s Playback Switch", chname[i]);
> 			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
>-					      HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT));
>+					      HDA_COMPOSE_AMP_VAL(0x1a, 3, 0,
>+								  HDA_OUTPUT));
> 			if (err < 0)
> 				return err;
> 		}
>@@ -1240,6 +1345,16 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)
> 	return 1;
> }
> 
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list vt1709_loopbacks[] = {
>+	{ 0x18, HDA_INPUT, 1 },
>+	{ 0x18, HDA_INPUT, 2 },
>+	{ 0x18, HDA_INPUT, 3 },
>+	{ 0x18, HDA_INPUT, 4 },
>+	{ } /* end */
>+};
>+#endif
>+
> static int patch_vt1709_10ch(struct hda_codec *codec)
> {
> 	struct via_spec *spec;
>@@ -1282,6 +1397,9 @@ static int patch_vt1709_10ch(struct hda_codec *codec)
> 	codec->patch_ops = via_patch_ops;
> 
> 	codec->patch_ops.init = via_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = vt1709_loopbacks;
>+#endif
> 
> 	return 0;
> }
>@@ -1323,8 +1441,6 @@ static struct hda_verb vt1709_6ch_volume_init_verbs[] = {
> 
> 	/* Set input of PW4 as MW0 */
> 	{0x20, AC_VERB_SET_CONNECT_SEL, 0},
>-	/* Set mic as default input of sw0 */
>-	{0x19, AC_VERB_SET_CONNECT_SEL, 0x2},
> 	/* PW9 Output enable */
> 	{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
> 	{ }
>@@ -1372,6 +1488,497 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
> 	codec->patch_ops = via_patch_ops;
> 
> 	codec->patch_ops.init = via_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = vt1709_loopbacks;
>+#endif
>+	return 0;
>+}
>+
>+/* capture mixer elements */
>+static struct snd_kcontrol_new vt1708B_capture_mixer[] = {
>+	HDA_CODEC_VOLUME("Capture Volume", 0x13, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE("Capture Switch", 0x13, 0x0, HDA_INPUT),
>+	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x14, 0x0, HDA_INPUT),
>+	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x14, 0x0, HDA_INPUT),
>+	{
>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
>+		/* The multiple "Capture Source" controls confuse alsamixer
>+		 * So call somewhat different..
>+		 */
>+		/* .name = "Capture Source", */
>+		.name = "Input Source",
>+		.count = 1,
>+		.info = via_mux_enum_info,
>+		.get = via_mux_enum_get,
>+		.put = via_mux_enum_put,
>+	},
>+	{ } /* end */
>+};
>+/*
>+ * generic initialization of ADC, input mixers and output mixers
>+ */
>+static struct hda_verb vt1708B_8ch_volume_init_verbs[] = {
>+	/*
>+	 * Unmute ADC0-1 and set the default input to mic-in
>+	 */
>+	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+
>+
>+	/* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
>+	 * mixer widget
>+	 */
>+	/* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
>+
>+	/*
>+	 * Set up output mixers
>+	 */
>+	/* set vol=0 to output mixers */
>+	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+
>+	/* Setup default input to PW4 */
>+	{0x1d, AC_VERB_SET_CONNECT_SEL, 0x1},
>+	/* PW9 Output enable */
>+	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
>+	/* PW10 Input enable */
>+	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
>+	{ }
>+};
>+
>+static struct hda_verb vt1708B_4ch_volume_init_verbs[] = {
>+	/*
>+	 * Unmute ADC0-1 and set the default input to mic-in
>+	 */
>+	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+
>+
>+	/* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
>+	 * mixer widget
>+	 */
>+	/* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
>+	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
>+
>+	/*
>+	 * Set up output mixers
>+	 */
>+	/* set vol=0 to output mixers */
>+	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+	{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
>+
>+	/* Setup default input of PW4 to MW0 */
>+	{0x1d, AC_VERB_SET_CONNECT_SEL, 0x0},
>+	/* PW9 Output enable */
>+	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
>+	/* PW10 Input enable */
>+	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
>+	{ }
>+};
>+
>+static struct hda_pcm_stream vt1708B_8ch_pcm_analog_playback = {
>+	.substreams = 1,
>+	.channels_min = 2,
>+	.channels_max = 8,
>+	.nid = 0x10, /* NID to query formats and rates */
>+	.ops = {
>+		.open = via_playback_pcm_open,
>+		.prepare = via_playback_pcm_prepare,
>+		.cleanup = via_playback_pcm_cleanup
>+	},
>+};
>+
>+static struct hda_pcm_stream vt1708B_4ch_pcm_analog_playback = {
>+	.substreams = 1,
>+	.channels_min = 2,
>+	.channels_max = 4,
>+	.nid = 0x10, /* NID to query formats and rates */
>+	.ops = {
>+		.open = via_playback_pcm_open,
>+		.prepare = via_playback_pcm_prepare,
>+		.cleanup = via_playback_pcm_cleanup
>+	},
>+};
>+
>+static struct hda_pcm_stream vt1708B_pcm_analog_capture = {
>+	.substreams = 2,
>+	.channels_min = 2,
>+	.channels_max = 2,
>+	.nid = 0x13, /* NID to query formats and rates */
>+	.ops = {
>+		.prepare = via_capture_pcm_prepare,
>+		.cleanup = via_capture_pcm_cleanup
>+	},
>+};
>+
>+static struct hda_pcm_stream vt1708B_pcm_digital_playback = {
>+	.substreams = 1,
>+	.channels_min = 2,
>+	.channels_max = 2,
>+	/* NID is set in via_build_pcms */
>+	.ops = {
>+		.open = via_dig_playback_pcm_open,
>+		.close = via_dig_playback_pcm_close,
>+		.prepare = via_dig_playback_pcm_prepare
>+	},
>+};
>+
>+static struct hda_pcm_stream vt1708B_pcm_digital_capture = {
>+	.substreams = 1,
>+	.channels_min = 2,
>+	.channels_max = 2,
>+};
>+
>+/* fill in the dac_nids table from the parsed pin configuration */
>+static int vt1708B_auto_fill_dac_nids(struct via_spec *spec,
>+				     const struct auto_pin_cfg *cfg)
>+{
>+	int i;
>+	hda_nid_t nid;
>+
>+	spec->multiout.num_dacs = cfg->line_outs;
>+
>+	spec->multiout.dac_nids = spec->private_dac_nids;
>+
>+	for (i = 0; i < 4; i++) {
>+		nid = cfg->line_out_pins[i];
>+		if (nid) {
>+			/* config dac list */
>+			switch (i) {
>+			case AUTO_SEQ_FRONT:
>+				spec->multiout.dac_nids[i] = 0x10;
>+				break;
>+			case AUTO_SEQ_CENLFE:
>+				spec->multiout.dac_nids[i] = 0x24;
>+				break;
>+			case AUTO_SEQ_SURROUND:
>+				spec->multiout.dac_nids[i] = 0x25;
>+				break;
>+			case AUTO_SEQ_SIDE:
>+				spec->multiout.dac_nids[i] = 0x11;
>+				break;
>+			}
>+		}
>+	}
>+
>+	return 0;
>+}
>+
>+/* add playback controls from the parsed DAC table */
>+static int vt1708B_auto_create_multi_out_ctls(struct via_spec *spec,
>+					     const struct auto_pin_cfg *cfg)
>+{
>+	char name[32];
>+	static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
>+	hda_nid_t nid_vols[] = {0x16, 0x27, 0x26, 0x18};
>+	hda_nid_t nid, nid_vol = 0;
>+	int i, err;
>+
>+	for (i = 0; i <= AUTO_SEQ_SIDE; i++) {
>+		nid = cfg->line_out_pins[i];
>+
>+		if (!nid)
>+			continue;
>+
>+		nid_vol = nid_vols[i];
>+
>+		if (i == AUTO_SEQ_CENLFE) {
>+			/* Center/LFE */
>+			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
>+					      "Center Playback Volume",
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,
>+								  HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
>+					      "LFE Playback Volume",
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,
>+								  HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
>+					      "Center Playback Switch",
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,
>+								  HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
>+					      "LFE Playback Switch",
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,
>+								  HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+		} else if (i == AUTO_SEQ_FRONT) {
>+			/* add control to mixer index 0 */
>+			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
>+					      "Master Front Playback Volume",
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
>+								  HDA_INPUT));
>+			if (err < 0)
>+				return err;
>+			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
>+					      "Master Front Playback Switch",
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
>+								  HDA_INPUT));
>+			if (err < 0)
>+				return err;
>+
>+			/* add control to PW3 */
>+			sprintf(name, "%s Playback Volume", chname[i]);
>+			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
>+					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+								  HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+			sprintf(name, "%s Playback Switch", chname[i]);
>+			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
>+					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,
>+								  HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+		} else {
>+			sprintf(name, "%s Playback Volume", chname[i]);
>+			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
>+								  HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+			sprintf(name, "%s Playback Switch", chname[i]);
>+			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
>+					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
>+								  HDA_OUTPUT));
>+			if (err < 0)
>+				return err;
>+		}
>+	}
>+
>+	return 0;
>+}
>+
>+static int vt1708B_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
>+{
>+	int err;
>+
>+	if (!pin)
>+		return 0;
>+
>+	spec->multiout.hp_nid = VT1708B_HP_NID; /* AOW3 */
>+
>+	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
>+			      "Headphone Playback Volume",
>+			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
>+	if (err < 0)
>+		return err;
>+	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
>+			      "Headphone Playback Switch",
>+			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
>+	if (err < 0)
>+		return err;
>+
>+	return 0;
>+}
>+
>+/* create playback/capture controls for input pins */
>+static int vt1708B_auto_create_analog_input_ctls(struct via_spec *spec,
>+						const struct auto_pin_cfg *cfg)
>+{
>+	static char *labels[] = {
>+		"Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
>+	};
>+	struct hda_input_mux *imux = &spec->private_imux;
>+	int i, err, idx = 0;
>+
>+	/* for internal loopback recording select */
>+	imux->items[imux->num_items].label = "Stereo Mixer";
>+	imux->items[imux->num_items].index = idx;
>+	imux->num_items++;
>+
>+	for (i = 0; i < AUTO_PIN_LAST; i++) {
>+		if (!cfg->input_pins[i])
>+			continue;
>+
>+		switch (cfg->input_pins[i]) {
>+		case 0x1a: /* Mic */
>+			idx = 2;
>+			break;
>+
>+		case 0x1b: /* Line In */
>+			idx = 3;
>+			break;
>+
>+		case 0x1e: /* Front Mic */
>+			idx = 4;
>+			break;
>+
>+		case 0x1f: /* CD */
>+			idx = 1;
>+			break;
>+		}
>+		err = via_new_analog_input(spec, cfg->input_pins[i], labels[i],
>+					   idx, 0x16);
>+		if (err < 0)
>+			return err;
>+		imux->items[imux->num_items].label = labels[i];
>+		imux->items[imux->num_items].index = idx;
>+		imux->num_items++;
>+	}
>+	return 0;
>+}
>+
>+static int vt1708B_parse_auto_config(struct hda_codec *codec)
>+{
>+	struct via_spec *spec = codec->spec;
>+	int err;
>+
>+	err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL);
>+	if (err < 0)
>+		return err;
>+	err = vt1708B_auto_fill_dac_nids(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	if (!spec->autocfg.line_outs && !spec->autocfg.hp_pins[0])
>+		return 0; /* can't find valid BIOS pin config */
>+
>+	err = vt1708B_auto_create_multi_out_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+	err = vt1708B_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
>+	if (err < 0)
>+		return err;
>+	err = vt1708B_auto_create_analog_input_ctls(spec, &spec->autocfg);
>+	if (err < 0)
>+		return err;
>+
>+	spec->multiout.max_channels = spec->multiout.num_dacs * 2;
>+
>+	if (spec->autocfg.dig_out_pin)
>+		spec->multiout.dig_out_nid = VT1708B_DIGOUT_NID;
>+	if (spec->autocfg.dig_in_pin)
>+		spec->dig_in_nid = VT1708B_DIGIN_NID;
>+
>+	if (spec->kctl_alloc)
>+		spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
>+
>+	spec->input_mux = &spec->private_imux;
>+
>+	return 1;
>+}
>+
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+static struct hda_amp_list vt1708B_loopbacks[] = {
>+	{ 0x16, HDA_INPUT, 1 },
>+	{ 0x16, HDA_INPUT, 2 },
>+	{ 0x16, HDA_INPUT, 3 },
>+	{ 0x16, HDA_INPUT, 4 },
>+	{ } /* end */
>+};
>+#endif
>+
>+static int patch_vt1708B_8ch(struct hda_codec *codec)
>+{
>+	struct via_spec *spec;
>+	int err;
>+
>+	/* create a codec specific record */
>+	spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
>+	if (spec == NULL)
>+		return -ENOMEM;
>+
>+	codec->spec = spec;
>+
>+	/* automatic parse from the BIOS config */
>+	err = vt1708B_parse_auto_config(codec);
>+	if (err < 0) {
>+		via_free(codec);
>+		return err;
>+	} else if (!err) {
>+		printk(KERN_INFO "hda_codec: Cannot set up configuration "
>+		       "from BIOS.  Using genenic mode...\n");
>+	}
>+
>+	spec->init_verbs = vt1708B_8ch_volume_init_verbs;
>+
>+	spec->stream_name_analog = "VT1708B Analog";
>+	spec->stream_analog_playback = &vt1708B_8ch_pcm_analog_playback;
>+	spec->stream_analog_capture = &vt1708B_pcm_analog_capture;
>+
>+	spec->stream_name_digital = "VT1708B Digital";
>+	spec->stream_digital_playback = &vt1708B_pcm_digital_playback;
>+	spec->stream_digital_capture = &vt1708B_pcm_digital_capture;
>+
>+	if (!spec->adc_nids && spec->input_mux) {
>+		spec->adc_nids = vt1708B_adc_nids;
>+		spec->num_adc_nids = ARRAY_SIZE(vt1708B_adc_nids);
>+		spec->mixers[spec->num_mixers] = vt1708B_capture_mixer;
>+		spec->num_mixers++;
>+	}
>+
>+	codec->patch_ops = via_patch_ops;
>+
>+	codec->patch_ops.init = via_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = vt1708B_loopbacks;
>+#endif
>+
>+	return 0;
>+}
>+
>+static int patch_vt1708B_4ch(struct hda_codec *codec)
>+{
>+	struct via_spec *spec;
>+	int err;
>+
>+	/* create a codec specific record */
>+	spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
>+	if (spec == NULL)
>+		return -ENOMEM;
>+
>+	codec->spec = spec;
>+
>+	/* automatic parse from the BIOS config */
>+	err = vt1708B_parse_auto_config(codec);
>+	if (err < 0) {
>+		via_free(codec);
>+		return err;
>+	} else if (!err) {
>+		printk(KERN_INFO "hda_codec: Cannot set up configuration "
>+		       "from BIOS.  Using genenic mode...\n");
>+	}
>+
>+	spec->init_verbs = vt1708B_4ch_volume_init_verbs;
>+
>+	spec->stream_name_analog = "VT1708B Analog";
>+	spec->stream_analog_playback = &vt1708B_4ch_pcm_analog_playback;
>+	spec->stream_analog_capture = &vt1708B_pcm_analog_capture;
>+
>+	spec->stream_name_digital = "VT1708B Digital";
>+	spec->stream_digital_playback = &vt1708B_pcm_digital_playback;
>+	spec->stream_digital_capture = &vt1708B_pcm_digital_capture;
>+
>+	if (!spec->adc_nids && spec->input_mux) {
>+		spec->adc_nids = vt1708B_adc_nids;
>+		spec->num_adc_nids = ARRAY_SIZE(vt1708B_adc_nids);
>+		spec->mixers[spec->num_mixers] = vt1708B_capture_mixer;
>+		spec->num_mixers++;
>+	}
>+
>+	codec->patch_ops = via_patch_ops;
>+
>+	codec->patch_ops.init = via_auto_init;
>+#ifdef CONFIG_SND_HDA_POWER_SAVE
>+	spec->loopback.amplist = vt1708B_loopbacks;
>+#endif
> 
> 	return 0;
> }
>@@ -1384,13 +1991,37 @@ struct hda_codec_preset snd_hda_preset_via[] = {
> 	{ .id = 0x11061709, .name = "VIA VT1708", .patch = patch_vt1708},
> 	{ .id = 0x1106170A, .name = "VIA VT1708", .patch = patch_vt1708},
> 	{ .id = 0x1106170B, .name = "VIA VT1708", .patch = patch_vt1708},
>-	{ .id = 0x1106E710, .name = "VIA VT1709 10-Ch", .patch = patch_vt1709_10ch},
>-	{ .id = 0x1106E711, .name = "VIA VT1709 10-Ch", .patch = patch_vt1709_10ch},
>-	{ .id = 0x1106E712, .name = "VIA VT1709 10-Ch", .patch = patch_vt1709_10ch},
>-	{ .id = 0x1106E713, .name = "VIA VT1709 10-Ch", .patch = patch_vt1709_10ch},
>-	{ .id = 0x1106E714, .name = "VIA VT1709 6-Ch", .patch = patch_vt1709_6ch},
>-	{ .id = 0x1106E715, .name = "VIA VT1709 6-Ch", .patch = patch_vt1709_6ch},
>-	{ .id = 0x1106E716, .name = "VIA VT1709 6-Ch", .patch = patch_vt1709_6ch},
>-	{ .id = 0x1106E717, .name = "VIA VT1709 6-Ch", .patch = patch_vt1709_6ch},
>+	{ .id = 0x1106E710, .name = "VIA VT1709 10-Ch",
>+	  .patch = patch_vt1709_10ch},
>+	{ .id = 0x1106E711, .name = "VIA VT1709 10-Ch",
>+	  .patch = patch_vt1709_10ch},
>+	{ .id = 0x1106E712, .name = "VIA VT1709 10-Ch",
>+	  .patch = patch_vt1709_10ch},
>+	{ .id = 0x1106E713, .name = "VIA VT1709 10-Ch",
>+	  .patch = patch_vt1709_10ch},
>+	{ .id = 0x1106E714, .name = "VIA VT1709 6-Ch",
>+	  .patch = patch_vt1709_6ch},
>+	{ .id = 0x1106E715, .name = "VIA VT1709 6-Ch",
>+	  .patch = patch_vt1709_6ch},
>+	{ .id = 0x1106E716, .name = "VIA VT1709 6-Ch",
>+	  .patch = patch_vt1709_6ch},
>+	{ .id = 0x1106E717, .name = "VIA VT1709 6-Ch",
>+	  .patch = patch_vt1709_6ch},
>+	{ .id = 0x1106E720, .name = "VIA VT1708B 8-Ch",
>+	  .patch = patch_vt1708B_8ch},
>+	{ .id = 0x1106E721, .name = "VIA VT1708B 8-Ch",
>+	  .patch = patch_vt1708B_8ch},
>+	{ .id = 0x1106E722, .name = "VIA VT1708B 8-Ch",
>+	  .patch = patch_vt1708B_8ch},
>+	{ .id = 0x1106E723, .name = "VIA VT1708B 8-Ch",
>+	  .patch = patch_vt1708B_8ch},
>+	{ .id = 0x1106E724, .name = "VIA VT1708B 4-Ch",
>+	  .patch = patch_vt1708B_4ch},
>+	{ .id = 0x1106E725, .name = "VIA VT1708B 4-Ch",
>+	  .patch = patch_vt1708B_4ch},
>+	{ .id = 0x1106E726, .name = "VIA VT1708B 4-Ch",
>+	  .patch = patch_vt1708B_4ch},
>+	{ .id = 0x1106E727, .name = "VIA VT1708B 4-Ch",
>+	  .patch = patch_vt1708B_4ch},
> 	{} /* terminator */
> };
>-- 
>1.5.5.1
>

Actions: View | Diff

Attachments on bug 451007: 309053 | 313555 | 313556