161 files changed, 14164 insertions, 3846 deletions

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 75c602b5b132..1298c68d6bf0 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -570,6 +570,7 @@ config SND_ICE1712
         tristate "ICEnsemble ICE1712 (Envy24)"
         select SND_MPU401_UART
         select SND_AC97_CODEC
+        select BITREVERSE
         help
           Say Y here to include support for soundcards based on the
           ICE1712 (Envy24) chip.
@@ -788,6 +789,7 @@ config SND_VIRTUOSO
           Say Y here to include support for sound cards based on the
           Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X,
           Essence ST (Deluxe), and Essence STX.
+          Support for the DS is experimental.
           Support for the HDAV1.3 (Deluxe) is very experimental.
 
           To compile this driver as a module, choose M here: the module
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 78288dbfc17a..a7630e9edf8a 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -83,6 +83,7 @@ static const struct ac97_codec_id snd_ac97_codec_id_vendors[] = {
 { 0x4e534300, 0xffffff00, "National Semiconductor", NULL, NULL },
 { 0x50534300, 0xffffff00, "Philips",            NULL,   NULL },
 { 0x53494c00, 0xffffff00, "Silicon Laboratory", NULL,   NULL },
+{ 0x53544d00, 0xffffff00, "STMicroelectronics", NULL,   NULL },
 { 0x54524100, 0xffffff00, "TriTech",            NULL,   NULL },
 { 0x54584e00, 0xffffff00, "Texas Instruments",  NULL,   NULL },
 { 0x56494100, 0xffffff00, "VIA Technologies",   NULL,   NULL },
@@ -161,6 +162,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
 { 0x4e534350, 0xffffffff, "LM4550",             patch_lm4550,   NULL }, // volume wrap fix 
 { 0x50534304, 0xffffffff, "UCB1400",            patch_ucb1400,  NULL },
 { 0x53494c20, 0xffffffe0, "Si3036,8",           mpatch_si3036,  mpatch_si3036, AC97_MODEM_PATCH },
+{ 0x53544d02, 0xffffffff, "ST7597",             NULL,           NULL },
 { 0x54524102, 0xffffffff, "TR28022",            NULL,           NULL },
 { 0x54524103, 0xffffffff, "TR28023",            NULL,           NULL },
 { 0x54524106, 0xffffffff, "TR28026",            NULL,           NULL },
@@ -213,6 +215,14 @@ static int snd_ac97_valid_reg(struct snd_ac97 *ac97, unsigned short reg)
 {
         /* filter some registers for buggy codecs */
         switch (ac97->id) {
+        case AC97_ID_ST_AC97_ID4:
+                if (reg == 0x08)
+                        return 0;
+                /* fall through */
+        case AC97_ID_ST7597:
+                if (reg == 0x22 || reg == 0x7a)
+                        return 1;
+                /* fall through */
         case AC97_ID_AK4540:
         case AC97_ID_AK4542:
                 if (reg <= 0x1c || reg == 0x20 || reg == 0x26 || reg >= 0x7c)
@@ -603,8 +613,8 @@ AC97_SINGLE("Tone Control - Treble", AC97_MASTER_TONE, 0, 15, 1)
 };
 
 static const struct snd_kcontrol_new snd_ac97_controls_pc_beep[2] = {
-AC97_SINGLE("PC Speaker Playback Switch", AC97_PC_BEEP, 15, 1, 1),
-AC97_SINGLE("PC Speaker Playback Volume", AC97_PC_BEEP, 1, 15, 1)
+AC97_SINGLE("Beep Playback Switch", AC97_PC_BEEP, 15, 1, 1),
+AC97_SINGLE("Beep Playback Volume", AC97_PC_BEEP, 1, 15, 1)
 };
 
 static const struct snd_kcontrol_new snd_ac97_controls_mic_boost =
@@ -1393,7 +1403,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
                 }
         }
         
-        /* build PC Speaker controls */
+        /* build Beep controls */
         if (!(ac97->flags & AC97_HAS_NO_PC_BEEP) && 
                 ((ac97->flags & AC97_HAS_PC_BEEP) ||
             snd_ac97_try_volume_mix(ac97, AC97_PC_BEEP))) {
@@ -2122,7 +2132,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
                 }
                 /* nothing should be in powerdown mode */
                 snd_ac97_write_cache(ac97, AC97_GENERAL_PURPOSE, 0);
-                end_time = jiffies + msecs_to_jiffies(120);
+                end_time = jiffies + msecs_to_jiffies(5000);
                 do {
                         if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f)
                                 goto __ready_ok;
diff --git a/sound/pci/ac97/ac97_id.h b/sound/pci/ac97/ac97_id.h
index c129492c82b3..d603147c4a96 100644
--- a/sound/pci/ac97/ac97_id.h
+++ b/sound/pci/ac97/ac97_id.h
@@ -62,3 +62,5 @@
 #define AC97_ID_CM9761_78       0x434d4978
 #define AC97_ID_CM9761_82       0x434d4982
 #define AC97_ID_CM9761_83       0x434d4983
+#define AC97_ID_ST7597          0x53544d02
+#define AC97_ID_ST_AC97_ID4     0x53544d04
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 7337abdbe4e3..e68c98ef4041 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -544,25 +544,10 @@ static int patch_wolfson04(struct snd_ac97 * ac97)
         return 0;
 }
 
-static int patch_wolfson_wm9705_specific(struct snd_ac97 * ac97)
-{
-        int err, i;
-        for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) {
-                if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm97xx_snd_ac97_controls[i], ac97))) < 0)
-                        return err;
-        }
-        snd_ac97_write_cache(ac97,  0x72, 0x0808);
-        return 0;
-}
-
-static struct snd_ac97_build_ops patch_wolfson_wm9705_ops = {
-        .build_specific = patch_wolfson_wm9705_specific,
-};
-
 static int patch_wolfson05(struct snd_ac97 * ac97)
 {
         /* WM9705, WM9710 */
-        ac97->build_ops = &patch_wolfson_wm9705_ops;
+        ac97->build_ops = &patch_wolfson_wm9703_ops;
 #ifdef CONFIG_TOUCHSCREEN_WM9705
         /* WM9705 touchscreen uses AUX and VIDEO for touch */
         ac97->flags |= AC97_HAS_NO_VIDEO | AC97_HAS_NO_AUX;
@@ -800,12 +785,12 @@ AC97_SINGLE("Mono Switch", AC97_MASTER_TONE, 7, 1, 1),
 AC97_SINGLE("Mono ZC Switch", AC97_MASTER_TONE, 6, 1, 0),
 AC97_SINGLE("Mono Volume", AC97_MASTER_TONE, 0, 31, 1),
 
-AC97_SINGLE("PC Beep to Headphone Switch", AC97_AUX, 15, 1, 1),
-AC97_SINGLE("PC Beep to Headphone Volume", AC97_AUX, 12, 7, 1),
-AC97_SINGLE("PC Beep to Master Switch", AC97_AUX, 11, 1, 1),
-AC97_SINGLE("PC Beep to Master Volume", AC97_AUX, 8, 7, 1),
-AC97_SINGLE("PC Beep to Mono Switch", AC97_AUX, 7, 1, 1),
-AC97_SINGLE("PC Beep to Mono Volume", AC97_AUX, 4, 7, 1),
+AC97_SINGLE("Beep to Headphone Switch", AC97_AUX, 15, 1, 1),
+AC97_SINGLE("Beep to Headphone Volume", AC97_AUX, 12, 7, 1),
+AC97_SINGLE("Beep to Master Switch", AC97_AUX, 11, 1, 1),
+AC97_SINGLE("Beep to Master Volume", AC97_AUX, 8, 7, 1),
+AC97_SINGLE("Beep to Mono Switch", AC97_AUX, 7, 1, 1),
+AC97_SINGLE("Beep to Mono Volume", AC97_AUX, 4, 7, 1),
 
 AC97_SINGLE("Voice to Headphone Switch", AC97_PCM, 15, 1, 1),
 AC97_SINGLE("Voice to Headphone Volume", AC97_PCM, 12, 7, 1),
@@ -1867,11 +1852,14 @@ static unsigned int ad1981_jacks_blacklist[] = {
         0x10140523, /* Thinkpad R40 */
         0x10140534, /* Thinkpad X31 */
         0x10140537, /* Thinkpad T41p */
+        0x1014053e, /* Thinkpad R40e */
         0x10140554, /* Thinkpad T42p/R50p */
         0x10140567, /* Thinkpad T43p 2668-G7U */
         0x10140581, /* Thinkpad X41-2527 */
+        0x10280160, /* Dell Dimension 2400 */
         0x104380b0, /* Asus A7V8X-MX */
         0x11790241, /* Toshiba Satellite A-15 S127 */
+        0x1179ff10, /* Toshiba P500 */
         0x144dc01a, /* Samsung NP-X20C004/SEG */
         0 /* end */
 };
diff --git a/sound/pci/ac97/ac97_proc.c b/sound/pci/ac97/ac97_proc.c
index 73b17d526c8b..6320bf084e47 100644
--- a/sound/pci/ac97/ac97_proc.c
+++ b/sound/pci/ac97/ac97_proc.c
@@ -22,7 +22,6 @@
  *
  */
 
-#include <linux/slab.h>
 #include <linux/mutex.h>
 
 #include <sound/core.h>
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 8f5098f92c37..4382d0fa6b9a 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -1048,7 +1048,7 @@ snd_ad1889_remove(struct pci_dev *pci)
         pci_set_drvdata(pci, NULL);
 }
 
-static struct pci_device_id snd_ad1889_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_ad1889_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_ANALOG_DEVICES, PCI_DEVICE_ID_AD1889JS) },
         { 0, },
 };
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index aaf4da68969c..5c6e322a48f0 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -275,7 +275,7 @@ struct snd_ali {
 #endif
 };
 
-static struct pci_device_id snd_ali_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_ali_ids) = {
         {PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5451), 0, 0, 0},
         {0, }
 };
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 3aa35af7ca91..d7653cb7ac60 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -145,7 +145,7 @@ struct snd_als300_substream_data {
         int block_counter_register;
 };
 
-static struct pci_device_id snd_als300_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_als300_ids) = {
         { 0x4005, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300 },
         { 0x4005, 0x0308, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300_PLUS },
         { 0, }
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index 3dbacde1a5af..6cf1de8042e8 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -68,7 +68,6 @@
 #include <asm/io.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/moduleparam.h>
 #include <linux/dma-mapping.h>
@@ -117,7 +116,7 @@ struct snd_card_als4000 {
 #endif
 };
 
-static struct pci_device_id snd_als4000_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_als4000_ids) = {
         { 0x4005, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },   /* ALS4000 */
         { 0, }
 };
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index d6752dff2a44..49d572a7b235 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -286,7 +286,7 @@ struct atiixp {
 
 /*
  */
-static struct pci_device_id snd_atiixp_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_atiixp_ids) = {
         { PCI_VDEVICE(ATI, 0x4341), 0 }, /* SB200 */
         { PCI_VDEVICE(ATI, 0x4361), 0 }, /* SB300 */
         { PCI_VDEVICE(ATI, 0x4370), 0 }, /* SB400 */
@@ -297,6 +297,7 @@ static struct pci_device_id snd_atiixp_ids[] = {
 MODULE_DEVICE_TABLE(pci, snd_atiixp_ids);
 
 static struct snd_pci_quirk atiixp_quirks[] __devinitdata = {
+        SND_PCI_QUIRK(0x105b, 0x0c81, "Foxconn RC4107MA-RS2", 0),
         SND_PCI_QUIRK(0x15bd, 0x3100, "DFI RS482", 0),
         { } /* terminator */
 };
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index e7e147bf8eb2..91d7036b6411 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -261,7 +261,7 @@ struct atiixp_modem {
 
 /*
  */
-static struct pci_device_id snd_atiixp_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_atiixp_ids) = {
         { PCI_VDEVICE(ATI, 0x434d), 0 }, /* SB200 */
         { PCI_VDEVICE(ATI, 0x4378), 0 }, /* SB400 */
         { 0, }
diff --git a/sound/pci/au88x0/au8810.c b/sound/pci/au88x0/au8810.c
index c0e8c6b295cb..aa51cc7771dd 100644
--- a/sound/pci/au88x0/au8810.c
+++ b/sound/pci/au88x0/au8810.c
@@ -1,6 +1,6 @@
 #include "au8810.h"
 #include "au88x0.h"
-static struct pci_device_id snd_vortex_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_vortex_ids) = {
         {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE), 1,},
         {0,}
 };
diff --git a/sound/pci/au88x0/au8820.c b/sound/pci/au88x0/au8820.c
index a6527330df58..2f321e7306cd 100644
--- a/sound/pci/au88x0/au8820.c
+++ b/sound/pci/au88x0/au8820.c
@@ -1,6 +1,6 @@
 #include "au8820.h"
 #include "au88x0.h"
-static struct pci_device_id snd_vortex_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_vortex_ids) = {
         {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1), 0,},
         {0,}
 };
diff --git a/sound/pci/au88x0/au8830.c b/sound/pci/au88x0/au8830.c
index 6c702ad4352a..279b78f06d22 100644
--- a/sound/pci/au88x0/au8830.c
+++ b/sound/pci/au88x0/au8830.c
@@ -1,6 +1,6 @@
 #include "au8830.h"
 #include "au88x0.h"
-static struct pci_device_id snd_vortex_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_vortex_ids) = {
         {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2), 0,},
         {0,}
 };
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index 4d34bb0d99d3..67921f93a41e 100644
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -164,7 +164,7 @@ MODULE_PARM_DESC(id, "ID string for the Audiowerk2 soundcard.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard.");
 
-static struct pci_device_id snd_aw2_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_aw2_ids) = {
         {PCI_VENDOR_ID_SAA7146, PCI_DEVICE_ID_SAA7146, 0, 0,
          0, 0, 0},
         {0}
diff --git a/sound/pci/aw2/aw2-saa7146.c b/sound/pci/aw2/aw2-saa7146.c
index 296123ab74f7..8afd8b5d1ac7 100644
--- a/sound/pci/aw2/aw2-saa7146.c
+++ b/sound/pci/aw2/aw2-saa7146.c
@@ -25,7 +25,6 @@
 
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <asm/system.h>
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 8451a0169f32..4679ed83a43b 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -350,7 +350,7 @@ struct snd_azf3328 {
 #endif
 };
 
-static const struct pci_device_id snd_azf3328_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_azf3328_ids) = {
         { 0x122D, 0x50DC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },   /* PCI168/3328 */
         { 0x122D, 0x80DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },   /* 3328 */
         { 0, }
@@ -830,8 +830,8 @@ static struct snd_kcontrol_new snd_azf3328_mixer_controls[] __devinitdata = {
         AZF3328_MIXER_SWITCH("Mic Boost (+20dB)", IDX_MIXER_MIC, 6, 0),
         AZF3328_MIXER_SWITCH("Line Playback Switch", IDX_MIXER_LINEIN, 15, 1),
         AZF3328_MIXER_VOL_STEREO("Line Playback Volume", IDX_MIXER_LINEIN, 0x1f, 1),
-        AZF3328_MIXER_SWITCH("PC Speaker Playback Switch", IDX_MIXER_PCBEEP, 15, 1),
-        AZF3328_MIXER_VOL_SPECIAL("PC Speaker Playback Volume", IDX_MIXER_PCBEEP, 0x0f, 1, 1),
+        AZF3328_MIXER_SWITCH("Beep Playback Switch", IDX_MIXER_PCBEEP, 15, 1),
+        AZF3328_MIXER_VOL_SPECIAL("Beep Playback Volume", IDX_MIXER_PCBEEP, 0x0f, 1, 1),
         AZF3328_MIXER_SWITCH("Video Playback Switch", IDX_MIXER_VIDEO, 15, 1),
         AZF3328_MIXER_VOL_STEREO("Video Playback Volume", IDX_MIXER_VIDEO, 0x1f, 1),
         AZF3328_MIXER_SWITCH("Aux Playback Switch", IDX_MIXER_AUX, 15, 1),
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 4e2b925a94cc..37e1b5df5ab8 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -795,7 +795,7 @@ fail:
           .driver_data = SND_BT87X_BOARD_ ## id }
 /* driver_data is the card id for that device */
 
-static struct pci_device_id snd_bt87x_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_ids) = {
         /* Hauppauge WinTV series */
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0x13eb, GENERIC),
         /* Hauppauge WinTV series */
@@ -964,7 +964,7 @@ static void __devexit snd_bt87x_remove(struct pci_dev *pci)
 
 /* default entries for all Bt87x cards - it's not exported */
 /* driver_data is set to 0 to call detection */
-static struct pci_device_id snd_bt87x_default_ids[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_default_ids) = {
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),
         { }
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 15e4138bce17..0a3d3d6e77b4 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1875,7 +1875,7 @@ static int snd_ca0106_resume(struct pci_dev *pci)
 #endif
 
 // PCI IDs
-static struct pci_device_id snd_ca0106_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_ca0106_ids) = {
         { PCI_VDEVICE(CREATIVE, 0x0007), 0 },   /* Audigy LS or Live 24bit */
         { 0, }
 };
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index c8c6f437f5b3..85fd315d9999 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -63,7 +63,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -792,8 +791,8 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
                 "Phone Playback Volume",
                 "Video Playback Switch",
                 "Video Playback Volume",
-                "PC Speaker Playback Switch",
-                "PC Speaker Playback Volume",
+                "Beep Playback Switch",
+                "Beep Playback Volume",
                 "Mono Output Select",
                 "Capture Source",
                 "Capture Switch",
diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c
index c62b7d10ec61..ba96428c9f4c 100644
--- a/sound/pci/ca0106/ca0106_proc.c
+++ b/sound/pci/ca0106/ca0106_proc.c
@@ -63,7 +63,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -233,7 +232,7 @@ static void snd_ca0106_proc_dump_iec958( struct snd_info_buffer *buffer, u32 val
                         snd_iprintf(buffer, "user-defined\n");
                         break;
                 default:
-                        snd_iprintf(buffer, "unkown\n");
+                        snd_iprintf(buffer, "unknown\n");
                         break;
                 }
                 snd_iprintf(buffer, "Sample Bits: ");
@@ -304,7 +303,7 @@ static void snd_ca0106_proc_reg_write32(struct snd_info_entry *entry,
         while (!snd_info_get_line(buffer, line, sizeof(line))) {
                 if (sscanf(line, "%x %x", &reg, &val) != 2)
                         continue;
-                if ((reg < 0x40) && (reg >=0) && (val <= 0xffffffff) ) {
+                if (reg < 0x40 && val <= 0xffffffff) {
                         spin_lock_irqsave(&emu->emu_lock, flags);
                         outl(val, emu->port + (reg & 0xfffffffc));
                         spin_unlock_irqrestore(&emu->emu_lock, flags);
@@ -405,7 +404,7 @@ static void snd_ca0106_proc_reg_write(struct snd_info_entry *entry,
         while (!snd_info_get_line(buffer, line, sizeof(line))) {
                 if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
                         continue;
-                if ((reg < 0x80) && (reg >=0) && (val <= 0xffffffff) && (channel_id >=0) && (channel_id <= 3) )
+                if (reg < 0x80 && val <= 0xffffffff && channel_id <= 3)
                         snd_ca0106_ptr_write(emu, reg, channel_id, val);
         }
 }
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index ddcd4a9fd7e6..329968edca9b 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -941,13 +941,21 @@ static snd_pcm_uframes_t snd_cmipci_pcm_pointer(struct cmipci *cm, struct cmipci
                                                 struct snd_pcm_substream *substream)
 {
         size_t ptr;
-        unsigned int reg;
+        unsigned int reg, rem, tries;
+
         if (!rec->running)
                 return 0;
 #if 1 // this seems better..
         reg = rec->ch ? CM_REG_CH1_FRAME2 : CM_REG_CH0_FRAME2;
-        ptr = rec->dma_size - (snd_cmipci_read_w(cm, reg) + 1);
-        ptr >>= rec->shift;
+        for (tries = 0; tries < 3; tries++) {
+                rem = snd_cmipci_read_w(cm, reg);
+                if (rem < rec->dma_size)
+                        goto ok;
+        } 
+        printk(KERN_ERR "cmipci: invalid PCM pointer: %#x\n", rem);
+        return SNDRV_PCM_POS_XRUN;
+ok:
+        ptr = (rec->dma_size - (rem + 1)) >> rec->shift;
 #else
         reg = rec->ch ? CM_REG_CH1_FRAME1 : CM_REG_CH0_FRAME1;
         ptr = snd_cmipci_read(cm, reg) - rec->offset;
@@ -2302,7 +2310,7 @@ static struct snd_kcontrol_new snd_cmipci_mixers[] __devinitdata = {
         CMIPCI_SB_VOL_MONO("Mic Playback Volume", SB_DSP4_MIC_DEV, 3, 31),
         CMIPCI_SB_SW_MONO("Mic Playback Switch", 0),
         CMIPCI_DOUBLE("Mic Capture Switch", SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT, 0, 0, 1, 0, 0),
-        CMIPCI_SB_VOL_MONO("PC Speaker Playback Volume", SB_DSP4_SPEAKER_DEV, 6, 3),
+        CMIPCI_SB_VOL_MONO("Beep Playback Volume", SB_DSP4_SPEAKER_DEV, 6, 3),
         CMIPCI_MIXER_VOL_STEREO("Aux Playback Volume", CM_REG_AUX_VOL, 4, 0, 15),
         CMIPCI_MIXER_SW_STEREO("Aux Playback Switch", CM_REG_MIXER2, CM_VAUXLM_SHIFT, CM_VAUXRM_SHIFT, 0),
         CMIPCI_MIXER_SW_STEREO("Aux Capture Switch", CM_REG_MIXER2, CM_RAUXLEN_SHIFT, CM_RAUXREN_SHIFT, 0),
@@ -2310,7 +2318,7 @@ static struct snd_kcontrol_new snd_cmipci_mixers[] __devinitdata = {
         CMIPCI_MIXER_VOL_MONO("Mic Capture Volume", CM_REG_MIXER2, CM_VADMIC_SHIFT, 7),
         CMIPCI_SB_VOL_MONO("Phone Playback Volume", CM_REG_EXTENT_IND, 5, 7),
         CMIPCI_DOUBLE("Phone Playback Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 4, 4, 1, 0, 0),
-        CMIPCI_DOUBLE("PC Speaker Playback Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 3, 3, 1, 0, 0),
+        CMIPCI_DOUBLE("Beep Playback Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 3, 3, 1, 0, 0),
         CMIPCI_DOUBLE("Mic Boost Capture Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 0, 0, 1, 0, 0),
 };
 
@@ -2796,7 +2804,7 @@ static inline void snd_cmipci_proc_init(struct cmipci *cm) {}
 #endif
 
 
-static struct pci_device_id snd_cmipci_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_cmipci_ids) = {
         {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A), 0},
         {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B), 0},
         {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738), 0},
@@ -3018,7 +3026,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
         int integrated_midi = 0;
         char modelstr[16];
         int pcm_index, pcm_spdif_index;
-        static struct pci_device_id intel_82437vx[] = {
+        static DEFINE_PCI_DEVICE_TABLE(intel_82437vx) = {
                 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) },
                 { },
         };
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index e2e0359bb056..9edc65059e3e 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -494,7 +494,7 @@ struct cs4281 {
 
 static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id);
 
-static struct pci_device_id snd_cs4281_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_cs4281_ids) = {
         { PCI_VDEVICE(CIRRUS, 0x6005), 0, },    /* CS4281 */
         { 0, }
 };
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c
index 033aec430117..767fa7f06cd0 100644
--- a/sound/pci/cs46xx/cs46xx.c
+++ b/sound/pci/cs46xx/cs46xx.c
@@ -64,7 +64,7 @@ MODULE_PARM_DESC(thinkpad, "Force to enable Thinkpad's CLKRUN control.");
 module_param_array(mmap_valid, bool, NULL, 0444);
 MODULE_PARM_DESC(mmap_valid, "Support OSS mmap.");
 
-static struct pci_device_id snd_cs46xx_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_cs46xx_ids) = {
         { PCI_VDEVICE(CIRRUS, 0x6001), 0, },   /* CS4280 */
         { PCI_VDEVICE(CIRRUS, 0x6003), 0, },   /* CS4612 */
         { PCI_VDEVICE(CIRRUS, 0x6004), 0, },   /* CS4615 */
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 1be96ead4244..3f99a5e8528c 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -2238,11 +2238,11 @@ static void snd_cs46xx_codec_reset (struct snd_ac97 * ac97)
 
         /* set the desired CODEC mode */
         if (ac97->num == CS46XX_PRIMARY_CODEC_INDEX) {
-                snd_printdd("cs46xx: CODOEC1 mode %04x\n",0x0);
-                snd_cs46xx_ac97_write(ac97,AC97_CSR_ACMODE,0x0);
+                snd_printdd("cs46xx: CODEC1 mode %04x\n", 0x0);
+                snd_cs46xx_ac97_write(ac97, AC97_CSR_ACMODE, 0x0);
         } else if (ac97->num == CS46XX_SECONDARY_CODEC_INDEX) {
-                snd_printdd("cs46xx: CODOEC2 mode %04x\n",0x3);
-                snd_cs46xx_ac97_write(ac97,AC97_CSR_ACMODE,0x3);
+                snd_printdd("cs46xx: CODEC2 mode %04x\n", 0x3);
+                snd_cs46xx_ac97_write(ac97, AC97_CSR_ACMODE, 0x3);
         } else {
                 snd_BUG(); /* should never happen ... */
         }
@@ -2266,7 +2266,7 @@ static void snd_cs46xx_codec_reset (struct snd_ac97 * ac97)
                         return;
 
                 /* test if we can write to the record gain volume register */
-                snd_ac97_write_cache(ac97, AC97_REC_GAIN, 0x8a05);
+                snd_ac97_write(ac97, AC97_REC_GAIN, 0x8a05);
                 if ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) == 0x8a05)
                         return;
 
@@ -3597,7 +3597,7 @@ static struct cs_card_type __devinitdata cards[] = {
 #ifdef CONFIG_PM
 static unsigned int saved_regs[] = {
         BA0_ACOSV,
-        BA0_ASER_FADDR,
+        /*BA0_ASER_FADDR,*/
         BA0_ASER_MASTER,
         BA1_PVOL,
         BA1_CVOL,
@@ -3644,6 +3644,7 @@ int snd_cs46xx_resume(struct pci_dev *pci)
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
         int i;
 #endif
+        unsigned int tmp;
 
         pci_set_power_state(pci, PCI_D0);
         pci_restore_state(pci);
@@ -3685,6 +3686,15 @@ int snd_cs46xx_resume(struct pci_dev *pci)
         snd_ac97_resume(chip->ac97[CS46XX_PRIMARY_CODEC_INDEX]);
         snd_ac97_resume(chip->ac97[CS46XX_SECONDARY_CODEC_INDEX]);
 
+        /*
+         *  Stop capture DMA.
+         */
+        tmp = snd_cs46xx_peek(chip, BA1_CCTL);
+        chip->capt.ctl = tmp & 0x0000ffff;
+        snd_cs46xx_poke(chip, BA1_CCTL, tmp & 0xffff0000);
+
+        mdelay(5);
+
         /* reset playback/capture */
         snd_cs46xx_set_play_sample_rate(chip, 8000);
         snd_cs46xx_set_capture_sample_rate(chip, 8000);
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c
index f4f0c8f5dad7..3e5ca8fb519f 100644
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
@@ -298,6 +298,9 @@ void  cs46xx_dsp_spos_destroy (struct snd_cs46xx * chip)
                 if (ins->scbs[i].deleted) continue;
 
                 cs46xx_dsp_proc_free_scb_desc ( (ins->scbs + i) );
+#ifdef CONFIG_PM
+                kfree(ins->scbs[i].data);
+#endif
         }
 
         kfree(ins->code.data);
@@ -974,13 +977,11 @@ static struct dsp_scb_descriptor * _map_scb (struct snd_cs46xx *chip, char * nam
 
         index = find_free_scb_index (ins);
 
+        memset(&ins->scbs[index], 0, sizeof(ins->scbs[index]));
         strcpy(ins->scbs[index].scb_name, name);
         ins->scbs[index].address = dest;
         ins->scbs[index].index = index;
-        ins->scbs[index].proc_info = NULL;
         ins->scbs[index].ref_count = 1;
-        ins->scbs[index].deleted = 0;
-        spin_lock_init(&ins->scbs[index].lock);
 
         desc = (ins->scbs + index);
         ins->scbs[index].scb_symbol = add_symbol (chip, name, dest, SYMBOL_PARAMETER);
@@ -1022,17 +1023,29 @@ _map_task_tree (struct snd_cs46xx *chip, char * name, u32 dest, u32 size)
         return desc;
 }
 
+#define SCB_BYTES       (0x10 * 4)
+
 struct dsp_scb_descriptor *
 cs46xx_dsp_create_scb (struct snd_cs46xx *chip, char * name, u32 * scb_data, u32 dest)
 {
         struct dsp_scb_descriptor * desc;
 
+#ifdef CONFIG_PM
+        /* copy the data for resume */
+        scb_data = kmemdup(scb_data, SCB_BYTES, GFP_KERNEL);
+        if (!scb_data)
+                return NULL;
+#endif
+
         desc = _map_scb (chip,name,dest);
         if (desc) {
                 desc->data = scb_data;
                 _dsp_create_scb(chip,scb_data,dest);
         } else {
                 snd_printk(KERN_ERR "dsp_spos: failed to map SCB\n");
+#ifdef CONFIG_PM
+                kfree(scb_data);
+#endif
         }
 
         return desc;
@@ -1988,7 +2001,28 @@ int cs46xx_dsp_resume(struct snd_cs46xx * chip)
                         continue;
                 _dsp_create_scb(chip, s->data, s->address);
         }
-
+        for (i = 0; i < ins->nscb; i++) {
+                struct dsp_scb_descriptor *s = &ins->scbs[i];
+                if (s->deleted)
+                        continue;
+                if (s->updated)
+                        cs46xx_dsp_spos_update_scb(chip, s);
+                if (s->volume_set)
+                        cs46xx_dsp_scb_set_volume(chip, s,
+                                                  s->volume[0], s->volume[1]);
+        }
+        if (ins->spdif_status_out & DSP_SPDIF_STATUS_HW_ENABLED) {
+                cs46xx_dsp_enable_spdif_hw(chip);
+                snd_cs46xx_poke(chip, (ins->ref_snoop_scb->address + 2) << 2,
+                                (OUTPUT_SNOOP_BUFFER + 0x10) << 0x10);
+                if (ins->spdif_status_out & DSP_SPDIF_STATUS_PLAYBACK_OPEN)
+                        cs46xx_poke_via_dsp(chip, SP_SPDOUT_CSUV,
+                                            ins->spdif_csuv_stream);
+        }
+        if (chip->dsp_spos_instance->spdif_status_in) {
+                cs46xx_poke_via_dsp(chip, SP_ASER_COUNTDOWN, 0x80000005);
+                cs46xx_poke_via_dsp(chip, SP_SPDIN_CONTROL, 0x800003ff);
+        }
         return 0;
 }
 #endif
diff --git a/sound/pci/cs46xx/dsp_spos.h b/sound/pci/cs46xx/dsp_spos.h
index f9e169d33c03..ca47a8114c7f 100644
--- a/sound/pci/cs46xx/dsp_spos.h
+++ b/sound/pci/cs46xx/dsp_spos.h
@@ -212,6 +212,7 @@ static inline void cs46xx_dsp_spos_update_scb (struct snd_cs46xx * chip,
                         (scb->address + SCBsubListPtr) << 2,
                         (scb->sub_list_ptr->address << 0x10) |
                         (scb->next_scb_ptr->address));  
+        scb->updated = 1;
 }
 
 static inline void cs46xx_dsp_scb_set_volume (struct snd_cs46xx * chip,
@@ -222,6 +223,9 @@ static inline void cs46xx_dsp_scb_set_volume (struct snd_cs46xx * chip,
 
         snd_cs46xx_poke(chip, (scb->address + SCBVolumeCtrl) << 2, val);
         snd_cs46xx_poke(chip, (scb->address + SCBVolumeCtrl + 1) << 2, val);
+        scb->volume_set = 1;
+        scb->volume[0] = left;
+        scb->volume[1] = right;
 }
 #endif /* __DSP_SPOS_H__ */
 #endif /* CONFIG_SND_CS46XX_NEW_DSP  */
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index dd7c41b037b4..00b148a10239 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -115,7 +115,6 @@ static void cs46xx_dsp_proc_scb_info_read (struct snd_info_entry *entry,
 static void _dsp_unlink_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor * scb)
 {
         struct dsp_spos_instance * ins = chip->dsp_spos_instance;
-        unsigned long flags;
 
         if ( scb->parent_scb_ptr ) {
                 /* unlink parent SCB */
@@ -153,8 +152,6 @@ static void _dsp_unlink_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor
                         scb->next_scb_ptr = ins->the_null_scb;
                 }
 
-                spin_lock_irqsave(&chip->reg_lock, flags);    
-
                 /* update parent first entry in DSP RAM */
                 cs46xx_dsp_spos_update_scb(chip,scb->parent_scb_ptr);
 
@@ -162,7 +159,6 @@ static void _dsp_unlink_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor
                 cs46xx_dsp_spos_update_scb(chip,scb);
 
                 scb->parent_scb_ptr = NULL;
-                spin_unlock_irqrestore(&chip->reg_lock, flags);
         }
 }
 
@@ -197,9 +193,9 @@ void cs46xx_dsp_remove_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor *
                 goto _end;
 #endif
 
-        spin_lock_irqsave(&scb->lock, flags);
+        spin_lock_irqsave(&chip->reg_lock, flags);    
         _dsp_unlink_scb (chip,scb);
-        spin_unlock_irqrestore(&scb->lock, flags);
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
 
         cs46xx_dsp_proc_free_scb_desc(scb);
         if (snd_BUG_ON(!scb->scb_symbol))
@@ -207,6 +203,10 @@ void cs46xx_dsp_remove_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor *
         remove_symbol (chip,scb->scb_symbol);
 
         ins->scbs[scb->index].deleted = 1;
+#ifdef CONFIG_PM
+        kfree(ins->scbs[scb->index].data);
+        ins->scbs[scb->index].data = NULL;
+#endif
 
         if (scb->index < ins->scb_highest_frag_index)
                 ins->scb_highest_frag_index = scb->index;
@@ -1508,20 +1508,17 @@ int cs46xx_dsp_pcm_unlink (struct snd_cs46xx * chip,
                        chip->dsp_spos_instance->npcm_channels <= 0))
                 return -EIO;
 
-        spin_lock(&pcm_channel->src_scb->lock);
-
+        spin_lock_irqsave(&chip->reg_lock, flags);
         if (pcm_channel->unlinked) {
-                spin_unlock(&pcm_channel->src_scb->lock);
+                spin_unlock_irqrestore(&chip->reg_lock, flags);
                 return -EIO;
         }
 
-        spin_lock_irqsave(&chip->reg_lock, flags);
         pcm_channel->unlinked = 1;
-        spin_unlock_irqrestore(&chip->reg_lock, flags);
 
         _dsp_unlink_scb (chip,pcm_channel->pcm_reader_scb);
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
 
-        spin_unlock(&pcm_channel->src_scb->lock);
         return 0;
 }
 
@@ -1533,10 +1530,10 @@ int cs46xx_dsp_pcm_link (struct snd_cs46xx * chip,
         struct dsp_scb_descriptor * src_scb = pcm_channel->src_scb;
         unsigned long flags;
 
-        spin_lock(&pcm_channel->src_scb->lock);
+        spin_lock_irqsave(&chip->reg_lock, flags);
 
         if (pcm_channel->unlinked == 0) {
-                spin_unlock(&pcm_channel->src_scb->lock);
+                spin_unlock_irqrestore(&chip->reg_lock, flags);
                 return -EIO;
         }
 
@@ -1552,8 +1549,6 @@ int cs46xx_dsp_pcm_link (struct snd_cs46xx * chip,
         snd_BUG_ON(pcm_channel->pcm_reader_scb->parent_scb_ptr);
         pcm_channel->pcm_reader_scb->parent_scb_ptr = parent_scb;
 
-        spin_lock_irqsave(&chip->reg_lock, flags);
-
         /* update SCB entry in DSP RAM */
         cs46xx_dsp_spos_update_scb(chip,pcm_channel->pcm_reader_scb);
 
@@ -1562,8 +1557,6 @@ int cs46xx_dsp_pcm_link (struct snd_cs46xx * chip,
 
         pcm_channel->unlinked = 0;
         spin_unlock_irqrestore(&chip->reg_lock, flags);
-
-        spin_unlock(&pcm_channel->src_scb->lock);
         return 0;
 }
 
@@ -1596,13 +1589,17 @@ cs46xx_add_record_source (struct snd_cs46xx *chip, struct dsp_scb_descriptor * s
 
 int cs46xx_src_unlink(struct snd_cs46xx *chip, struct dsp_scb_descriptor * src)
 {
+        unsigned long flags;
+
         if (snd_BUG_ON(!src->parent_scb_ptr))
                 return -EINVAL;
 
         /* mute SCB */
         cs46xx_dsp_scb_set_volume (chip,src,0,0);
 
+        spin_lock_irqsave(&chip->reg_lock, flags);
         _dsp_unlink_scb (chip,src);
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
 
         return 0;
 }
diff --git a/sound/pci/cs46xx/imgs/cwcdma.asp b/sound/pci/cs46xx/imgs/cwcdma.asp
index 09d24c76f034..a65e1193c89a 100644
--- a/sound/pci/cs46xx/imgs/cwcdma.asp
+++ b/sound/pci/cs46xx/imgs/cwcdma.asp
@@ -26,10 +26,11 @@
 //
 //
 // The purpose of this code is very simple: make it possible to tranfser
-// the samples 'as they are' with no alteration from a PCMreader SCB (DMA from host)
-// to any other SCB. This is useful for AC3 throug SPDIF. SRC (source rate converters) 
-// task always alters the samples in some how, however it's from 48khz -> 48khz. The
-// alterations are not audible, but AC3 wont work. 
+// the samples 'as they are' with no alteration from a PCMreader
+// SCB (DMA from host) to any other SCB. This is useful for AC3 through SPDIF.
+// SRC (source rate converters) task always alters the samples in somehow,
+// however it's from 48khz -> 48khz.
+// The alterations are not audible, but AC3 wont work. 
 //
 //        ...
 //         |
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index dc464321d0f3..bc07e275d4d4 100644
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -39,6 +39,7 @@
 #include <linux/delay.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/sb.h>
 #include <sound/initval.h>
@@ -58,7 +59,7 @@ struct snd_cs5530 {
         unsigned long pci_base;
 };
 
-static struct pci_device_id snd_cs5530_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_cs5530_ids) = {
         {PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID,
                                                         PCI_ANY_ID, 0, 0},
         {0,}
diff --git a/sound/pci/cs5535audio/Makefile b/sound/pci/cs5535audio/Makefile
index fda7a94c992f..ccc642269b9e 100644
--- a/sound/pci/cs5535audio/Makefile
+++ b/sound/pci/cs5535audio/Makefile
@@ -4,9 +4,7 @@
 
 snd-cs5535audio-y := cs5535audio.o cs5535audio_pcm.o
 snd-cs5535audio-$(CONFIG_PM) += cs5535audio_pm.o
-ifdef CONFIG_MGEODE_LX
 snd-cs5535audio-$(CONFIG_OLPC) += cs5535audio_olpc.o
-endif
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_CS5535AUDIO) += snd-cs5535audio.o
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 05f56e04849b..afb803708416 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -66,7 +66,7 @@ MODULE_PARM_DESC(id, "ID string for " DRIVER_NAME);
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable " DRIVER_NAME);
 
-static struct pci_device_id snd_cs5535audio_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_cs5535audio_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO) },
         {}
@@ -389,6 +389,7 @@ probefail_out:
 
 static void __devexit snd_cs5535audio_remove(struct pci_dev *pci)
 {
+        olpc_quirks_cleanup();
         snd_card_free(pci_get_drvdata(pci));
         pci_set_drvdata(pci, NULL);
 }
diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h
index 7a298ac662e3..51966d782a3c 100644
--- a/sound/pci/cs5535audio/cs5535audio.h
+++ b/sound/pci/cs5535audio/cs5535audio.h
@@ -99,10 +99,11 @@ int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state);
 int snd_cs5535audio_resume(struct pci_dev *pci);
 #endif
 
-#if defined(CONFIG_OLPC) && defined(CONFIG_MGEODE_LX)
+#ifdef CONFIG_OLPC
 void __devinit olpc_prequirks(struct snd_card *card,
                 struct snd_ac97_template *ac97);
 int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97);
+void __devexit olpc_quirks_cleanup(void);
 void olpc_analog_input(struct snd_ac97 *ac97, int on);
 void olpc_mic_bias(struct snd_ac97 *ac97, int on);
 
@@ -128,6 +129,7 @@ static inline int olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)
 {
         return 0;
 }
+static inline void olpc_quirks_cleanup(void) { }
 static inline void olpc_analog_input(struct snd_ac97 *ac97, int on) { }
 static inline void olpc_mic_bias(struct snd_ac97 *ac97, int on) { }
 static inline void olpc_capture_open(struct snd_ac97 *ac97) { }
diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c
index 5c6814335cd7..50da49be9ae5 100644
--- a/sound/pci/cs5535audio/cs5535audio_olpc.c
+++ b/sound/pci/cs5535audio/cs5535audio_olpc.c
@@ -13,10 +13,13 @@
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/ac97_codec.h>
+#include <linux/gpio.h>
 
 #include <asm/olpc.h>
 #include "cs5535audio.h"
 
+#define DRV_NAME "cs5535audio-olpc"
+
 /*
  * OLPC has an additional feature on top of the regular AD1888 codec features.
  * It has an Analog Input mode that is switched into (after disabling the
@@ -38,10 +41,7 @@ void olpc_analog_input(struct snd_ac97 *ac97, int on)
         }
 
         /* set Analog Input through GPIO */
-        if (on)
-                geode_gpio_set(OLPC_GPIO_MIC_AC, GPIO_OUTPUT_VAL);
-        else
-                geode_gpio_clear(OLPC_GPIO_MIC_AC, GPIO_OUTPUT_VAL);
+        gpio_set_value(OLPC_GPIO_MIC_AC, on);
 }
 
 /*
@@ -73,8 +73,7 @@ static int olpc_dc_info(struct snd_kcontrol *kctl,
 
 static int olpc_dc_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *v)
 {
-        v->value.integer.value[0] = geode_gpio_isset(OLPC_GPIO_MIC_AC,
-                        GPIO_OUTPUT_VAL);
+        v->value.integer.value[0] = gpio_get_value(OLPC_GPIO_MIC_AC);
         return 0;
 }
 
@@ -153,6 +152,12 @@ int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)
         if (!machine_is_olpc())
                 return 0;
 
+        if (gpio_request(OLPC_GPIO_MIC_AC, DRV_NAME)) {
+                printk(KERN_ERR DRV_NAME ": unable to allocate MIC GPIO\n");
+                return -EIO;
+        }
+        gpio_direction_output(OLPC_GPIO_MIC_AC, 0);
+
         /* drop the original AD1888 HPF control */
         memset(&elem, 0, sizeof(elem));
         elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -169,11 +174,18 @@ int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)
         for (i = 0; i < ARRAY_SIZE(olpc_cs5535audio_ctls); i++) {
                 err = snd_ctl_add(card, snd_ctl_new1(&olpc_cs5535audio_ctls[i],
                                 ac97->private_data));
-                if (err < 0)
+                if (err < 0) {
+                        gpio_free(OLPC_GPIO_MIC_AC);
                         return err;
+                }
         }
 
         /* turn off the mic by default */
         olpc_mic_bias(ac97, 0);
         return 0;
 }
+
+void __devexit olpc_quirks_cleanup(void)
+{
+        gpio_free(OLPC_GPIO_MIC_AC);
+}
diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c
index 0f48a871f17b..f16bc8aad6ed 100644
--- a/sound/pci/cs5535audio/cs5535audio_pcm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pcm.c
@@ -23,7 +23,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/slab.h>
 #include <linux/pci.h>
 #include <sound/core.h>
 #include <sound/control.h>
diff --git a/sound/pci/cs5535audio/cs5535audio_pm.c b/sound/pci/cs5535audio/cs5535audio_pm.c
index 564c33b60953..a3301cc4ab82 100644
--- a/sound/pci/cs5535audio/cs5535audio_pm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pm.c
@@ -19,7 +19,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <sound/core.h>
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index 75454648d50c..1bff80cde0a2 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -24,6 +24,7 @@
 #include "ctdaio.h"
 #include "cttimer.h"
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <sound/pcm.h>
 #include <sound/control.h>
 #include <sound/asoundef.h>
@@ -166,18 +167,7 @@ static void ct_unmap_audio_buffer(struct ct_atc *atc, struct ct_atc_pcm *apcm)
 
 static unsigned long atc_get_ptp_phys(struct ct_atc *atc, int index)
 {
-        struct ct_vm *vm;
-        void *kvirt_addr;
-        unsigned long phys_addr;
-
-        vm = atc->vm;
-        kvirt_addr = vm->get_ptp_virt(vm, index);
-        if (kvirt_addr == NULL)
-                phys_addr = (~0UL);
-        else
-                phys_addr = virt_to_phys(kvirt_addr);
-
-        return phys_addr;
+        return atc->vm->get_ptp_phys(atc->vm, index);
 }
 
 static unsigned int convert_format(snd_pcm_format_t snd_format)
@@ -240,7 +230,7 @@ static int select_rom(unsigned int pitch)
         } else if (pitch == 0x02000000) {
                 /* pitch == 2 */
                 return 3;
-        } else if (pitch >= 0x0 && pitch <= 0x08000000) {
+        } else if (pitch <= 0x08000000) {
                 /* 0 <= pitch <= 8 */
                 return 0;
         } else {
@@ -1225,10 +1215,11 @@ static int atc_dev_free(struct snd_device *dev)
         return ct_atc_destroy(atc);
 }
 
-static int __devinit atc_identify_card(struct ct_atc *atc)
+static int __devinit atc_identify_card(struct ct_atc *atc, unsigned int ssid)
 {
         const struct snd_pci_quirk *p;
         const struct snd_pci_quirk *list;
+        u16 vendor_id, device_id;
 
         switch (atc->chip_type) {
         case ATC20K1:
@@ -1242,13 +1233,19 @@ static int __devinit atc_identify_card(struct ct_atc *atc)
         default:
                 return -ENOENT;
         }
-        p = snd_pci_quirk_lookup(atc->pci, list);
+        if (ssid) {
+                vendor_id = ssid >> 16;
+                device_id = ssid & 0xffff;
+        } else {
+                vendor_id = atc->pci->subsystem_vendor;
+                device_id = atc->pci->subsystem_device;
+        }
+        p = snd_pci_quirk_lookup_id(vendor_id, device_id, list);
         if (p) {
                 if (p->value < 0) {
                         printk(KERN_ERR "ctxfi: "
                                "Device %04x:%04x is black-listed\n",
-                               atc->pci->subsystem_vendor,
-                               atc->pci->subsystem_device);
+                               vendor_id, device_id);
                         return -ENOENT;
                 }
                 atc->model = p->value;
@@ -1261,8 +1258,7 @@ static int __devinit atc_identify_card(struct ct_atc *atc)
         atc->model_name = ct_subsys_name[atc->model];
         snd_printd("ctxfi: chip %s model %s (%04x:%04x) is found\n",
                    atc->chip_name, atc->model_name,
-                   atc->pci->subsystem_vendor,
-                   atc->pci->subsystem_device);
+                   vendor_id, device_id);
         return 0;
 }
 
@@ -1636,7 +1632,8 @@ static struct ct_atc atc_preset __devinitdata = {
 
 int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,
                             unsigned int rsr, unsigned int msr,
-                            int chip_type, struct ct_atc **ratc)
+                            int chip_type, unsigned int ssid,
+                            struct ct_atc **ratc)
 {
         struct ct_atc *atc;
         static struct snd_device_ops ops = {
@@ -1662,14 +1659,14 @@ int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,
         mutex_init(&atc->atc_mutex);
 
         /* Find card model */
-        err = atc_identify_card(atc);
+        err = atc_identify_card(atc, ssid);
         if (err < 0) {
                 printk(KERN_ERR "ctatc: Card not recognised\n");
                 goto error1;
         }
 
         /* Set up device virtual memory management object */
-        err = ct_vm_create(&atc->vm);
+        err = ct_vm_create(&atc->vm, pci);
         if (err < 0)
                 goto error1;
 
diff --git a/sound/pci/ctxfi/ctatc.h b/sound/pci/ctxfi/ctatc.h
index 9fd8a5708943..7167c0185d52 100644
--- a/sound/pci/ctxfi/ctatc.h
+++ b/sound/pci/ctxfi/ctatc.h
@@ -148,7 +148,7 @@ struct ct_atc {
 
 int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,
                             unsigned int rsr, unsigned int msr, int chip_type,
-                            struct ct_atc **ratc);
+                            unsigned int subsysid, struct ct_atc **ratc);
 int __devinit ct_atc_create_alsa_devs(struct ct_atc *atc);
 
 #endif /* CTATC_H */
diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c
index d0dc227fbdd3..85ab43e89212 100644
--- a/sound/pci/ctxfi/ctpcm.c
+++ b/sound/pci/ctxfi/ctpcm.c
@@ -17,6 +17,7 @@
 
 #include "ctpcm.h"
 #include "cttimer.h"
+#include <linux/slab.h>
 #include <sound/pcm.h>
 
 /* Hardware descriptions for playback */
diff --git a/sound/pci/ctxfi/ctvmem.c b/sound/pci/ctxfi/ctvmem.c
index 6b78752e9503..65da6e466f80 100644
--- a/sound/pci/ctxfi/ctvmem.c
+++ b/sound/pci/ctxfi/ctvmem.c
@@ -138,7 +138,7 @@ ct_vm_map(struct ct_vm *vm, struct snd_pcm_substream *substream, int size)
                 return NULL;
         }
 
-        ptp = vm->ptp[0];
+        ptp = (unsigned long *)vm->ptp[0].area;
         pte_start = (block->addr >> CT_PAGE_SHIFT);
         pages = block->size >> CT_PAGE_SHIFT;
         for (i = 0; i < pages; i++) {
@@ -158,25 +158,25 @@ static void ct_vm_unmap(struct ct_vm *vm, struct ct_vm_block *block)
 }
 
 /* *
- * return the host (kmalloced) addr of the @index-th device
- * page talbe page on success, or NULL on failure.
- * The first returned NULL indicates the termination.
+ * return the host physical addr of the @index-th device
+ * page table page on success, or ~0UL on failure.
+ * The first returned ~0UL indicates the termination.
  * */
-static void *
-ct_get_ptp_virt(struct ct_vm *vm, int index)
+static dma_addr_t
+ct_get_ptp_phys(struct ct_vm *vm, int index)
 {
-        void *addr;
+        dma_addr_t addr;
 
-        addr = (index >= CT_PTP_NUM) ? NULL : vm->ptp[index];
+        addr = (index >= CT_PTP_NUM) ? ~0UL : vm->ptp[index].addr;
 
         return addr;
 }
 
-int ct_vm_create(struct ct_vm **rvm)
+int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci)
 {
         struct ct_vm *vm;
         struct ct_vm_block *block;
-        int i;
+        int i, err = 0;
 
         *rvm = NULL;
 
@@ -188,23 +188,21 @@ int ct_vm_create(struct ct_vm **rvm)
 
         /* Allocate page table pages */
         for (i = 0; i < CT_PTP_NUM; i++) {
-                vm->ptp[i] = kmalloc(PAGE_SIZE, GFP_KERNEL);
-                if (!vm->ptp[i])
+                err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
+                                          snd_dma_pci_data(pci),
+                                          PAGE_SIZE, &vm->ptp[i]);
+                if (err < 0)
                         break;
         }
-        if (!i) {
+        if (err < 0) {
                 /* no page table pages are allocated */
-                kfree(vm);
+                ct_vm_destroy(vm);
                 return -ENOMEM;
         }
         vm->size = CT_ADDRS_PER_PAGE * i;
-        /* Initialise remaining ptps */
-        for (; i < CT_PTP_NUM; i++)
-                vm->ptp[i] = NULL;
-
         vm->map = ct_vm_map;
         vm->unmap = ct_vm_unmap;
-        vm->get_ptp_virt = ct_get_ptp_virt;
+        vm->get_ptp_phys = ct_get_ptp_phys;
         INIT_LIST_HEAD(&vm->unused);
         INIT_LIST_HEAD(&vm->used);
         block = kzalloc(sizeof(*block), GFP_KERNEL);
@@ -242,7 +240,7 @@ void ct_vm_destroy(struct ct_vm *vm)
 
         /* free allocated page table pages */
         for (i = 0; i < CT_PTP_NUM; i++)
-                kfree(vm->ptp[i]);
+                snd_dma_free_pages(&vm->ptp[i]);
 
         vm->size = 0;
 
diff --git a/sound/pci/ctxfi/ctvmem.h b/sound/pci/ctxfi/ctvmem.h
index 01e4fd0386a3..b23adfca4de6 100644
--- a/sound/pci/ctxfi/ctvmem.h
+++ b/sound/pci/ctxfi/ctvmem.h
@@ -22,6 +22,8 @@
 
 #include <linux/mutex.h>
 #include <linux/list.h>
+#include <linux/pci.h>
+#include <sound/memalloc.h>
 
 /* The chip can handle the page table of 4k pages
  * (emu20k1 can handle even 8k pages, but we don't use it right now)
@@ -41,7 +43,7 @@ struct snd_pcm_substream;
 
 /* Virtual memory management object for card device */
 struct ct_vm {
-        void *ptp[CT_PTP_NUM];          /* Device page table pages */
+        struct snd_dma_buffer ptp[CT_PTP_NUM];  /* Device page table pages */
         unsigned int size;              /* Available addr space in bytes */
         struct list_head unused;        /* List of unused blocks */
         struct list_head used;          /* List of used blocks */
@@ -52,10 +54,10 @@ struct ct_vm {
                                    int size);
         /* Unmap device logical addr area. */
         void (*unmap)(struct ct_vm *, struct ct_vm_block *block);
-        void *(*get_ptp_virt)(struct ct_vm *vm, int index);
+        dma_addr_t (*get_ptp_phys)(struct ct_vm *vm, int index);
 };
 
-int ct_vm_create(struct ct_vm **rvm);
+int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci);
 void ct_vm_destroy(struct ct_vm *vm);
 
 #endif /* CTVMEM_H */
diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c
index 76541748e7bc..f42e7e1a1074 100644
--- a/sound/pci/ctxfi/xfi.c
+++ b/sound/pci/ctxfi/xfi.c
@@ -32,6 +32,7 @@ module_param(multiple, uint, S_IRUGO);
 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 unsigned int subsystem[SNDRV_CARDS];
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Creative X-Fi driver");
@@ -39,8 +40,10 @@ module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for Creative X-Fi driver");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Creative X-Fi driver");
+module_param_array(subsystem, int, NULL, 0444);
+MODULE_PARM_DESC(subsystem, "Override subsystem ID for Creative X-Fi driver");
 
-static struct pci_device_id ct_pci_dev_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(ct_pci_dev_ids) = {
         /* only X-Fi is supported, so... */
         { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_20K1),
           .driver_data = ATC20K1,
@@ -85,7 +88,7 @@ ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                 multiple = 2;
         }
         err = ct_atc_create(card, pci, reference_rate, multiple,
-                            pci_id->driver_data, &atc);
+                            pci_id->driver_data, subsystem[dev], &atc);
         if (err < 0)
                 goto error;
 
diff --git a/sound/pci/echoaudio/darla20.c b/sound/pci/echoaudio/darla20.c
index 8c6db3aa3c1a..fe7ad64dccd7 100644
--- a/sound/pci/echoaudio/darla20.c
+++ b/sound/pci/echoaudio/darla20.c
@@ -40,9 +40,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -63,7 +63,7 @@ static const struct firmware card_fw[] = {
         {0, "darla20_dsp.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x1801, 0xECC0, 0x0010, 0, 0, 0},      /* DSP 56301 Darla20 rev.0 */
         {0,}
 };
diff --git a/sound/pci/echoaudio/darla20_dsp.c b/sound/pci/echoaudio/darla20_dsp.c
index 29043301ebb8..20c7cbc89bb3 100644
--- a/sound/pci/echoaudio/darla20_dsp.c
+++ b/sound/pci/echoaudio/darla20_dsp.c
@@ -45,7 +45,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->device_id = device_id;
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_DARLA20_DSP];
+        chip->dsp_code_to_load = FW_DARLA20_DSP;
         chip->spdif_status = GD_SPDIF_STATUS_UNDEF;
         chip->clock_state = GD_CLOCK_UNDEF;
         /* Since this card has no ASIC, mark it as loaded so everything
@@ -57,15 +57,19 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        if ((err = init_line_levels(chip)) < 0)
-                return err;
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        return init_line_levels(chip);
+}
+
+
+
 /* The Darla20 has no external clock sources */
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
diff --git a/sound/pci/echoaudio/darla24.c b/sound/pci/echoaudio/darla24.c
index 04cbf3eaf05a..d1fd34b1a8e3 100644
--- a/sound/pci/echoaudio/darla24.c
+++ b/sound/pci/echoaudio/darla24.c
@@ -44,9 +44,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -67,7 +67,7 @@ static const struct firmware card_fw[] = {
         {0, "darla24_dsp.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x1801, 0xECC0, 0x0040, 0, 0, 0},      /* DSP 56301 Darla24 rev.0 */
         {0x1057, 0x1801, 0xECC0, 0x0041, 0, 0, 0},      /* DSP 56301 Darla24 rev.1 */
         {0,}
diff --git a/sound/pci/echoaudio/darla24_dsp.c b/sound/pci/echoaudio/darla24_dsp.c
index 60228731841f..6da6663e9176 100644
--- a/sound/pci/echoaudio/darla24_dsp.c
+++ b/sound/pci/echoaudio/darla24_dsp.c
@@ -45,7 +45,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->device_id = device_id;
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_DARLA24_DSP];
+        chip->dsp_code_to_load = FW_DARLA24_DSP;
         /* Since this card has no ASIC, mark it as loaded so everything
            works OK */
         chip->asic_loaded = TRUE;
@@ -56,15 +56,19 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        if ((err = init_line_levels(chip)) < 0)
-                return err;
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        return init_line_levels(chip);
+}
+
+
+
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
         u32 clocks_from_dsp, clock_bits;
diff --git a/sound/pci/echoaudio/echo3g.c b/sound/pci/echoaudio/echo3g.c
index 4022e43a0053..1dffdc54416d 100644
--- a/sound/pci/echoaudio/echo3g.c
+++ b/sound/pci/echoaudio/echo3g.c
@@ -51,9 +51,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -81,7 +81,7 @@ static const struct firmware card_fw[] = {
         {0, "3g_asic.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x3410, 0xECC0, 0x0100, 0, 0, 0},      /* Echo 3G */
         {0,}
 };
diff --git a/sound/pci/echoaudio/echo3g_dsp.c b/sound/pci/echoaudio/echo3g_dsp.c
index 57967e580571..3cdc2ee2d1dd 100644
--- a/sound/pci/echoaudio/echo3g_dsp.c
+++ b/sound/pci/echoaudio/echo3g_dsp.c
@@ -61,7 +61,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
         chip->has_midi = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_ECHO3G_DSP];
+        chip->dsp_code_to_load = FW_ECHO3G_DSP;
 
         /* Load the DSP code and the ASIC on the PCI card and get
         what type of external box is attached */
@@ -97,20 +97,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->digital_modes =   ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_RCA |
                                 ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_OPTICAL |
                                 ECHOCAPS_HAS_DIGITAL_MODE_ADAT;
-        chip->digital_mode =    DIGITAL_MODE_SPDIF_RCA;
-        chip->professional_spdif = FALSE;
-        chip->non_audio_spdif = FALSE;
-        chip->bad_board = FALSE;
-
-        if ((err = init_line_levels(chip)) < 0)
-                return err;
-        err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
-        if (err < 0)
-                return err;
-        err = set_phantom_power(chip, 0);
-        if (err < 0)
-                return err;
-        err = set_professional_spdif(chip, TRUE);
 
         DE_INIT(("init_hw done\n"));
         return err;
@@ -118,6 +104,18 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        chip->digital_mode = DIGITAL_MODE_SPDIF_RCA;
+        chip->professional_spdif = FALSE;
+        chip->non_audio_spdif = FALSE;
+        chip->bad_board = FALSE;
+        chip->phantom_power = FALSE;
+        return init_line_levels(chip);
+}
+
+
+
 static int set_phantom_power(struct echoaudio *chip, char on)
 {
         u32 control_reg = le32_to_cpu(chip->comm_page->control_register);
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 1305f7ca02c3..668a5ec04499 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -36,22 +36,61 @@ MODULE_PARM_DESC(enable, "Enable " ECHOCARD_NAME " soundcard.");
 static unsigned int channels_list[10] = {1, 2, 4, 6, 8, 10, 12, 14, 16, 999999};
 static const DECLARE_TLV_DB_SCALE(db_scale_output_gain, -12800, 100, 1);
 
+
+
 static int get_firmware(const struct firmware **fw_entry,
-                        const struct firmware *frm, struct echoaudio *chip)
+                        struct echoaudio *chip, const short fw_index)
 {
         int err;
         char name[30];
-        DE_ACT(("firmware requested: %s\n", frm->data));
-        snprintf(name, sizeof(name), "ea/%s", frm->data);
-        if ((err = request_firmware(fw_entry, name, pci_device(chip))) < 0)
+
+#ifdef CONFIG_PM
+        if (chip->fw_cache[fw_index]) {
+                DE_ACT(("firmware requested: %s is cached\n", card_fw[fw_index].data));
+                *fw_entry = chip->fw_cache[fw_index];
+                return 0;
+        }
+#endif
+
+        DE_ACT(("firmware requested: %s\n", card_fw[fw_index].data));
+        snprintf(name, sizeof(name), "ea/%s", card_fw[fw_index].data);
+        err = request_firmware(fw_entry, name, pci_device(chip));
+        if (err < 0)
                 snd_printk(KERN_ERR "get_firmware(): Firmware not available (%d)\n", err);
+#ifdef CONFIG_PM
+        else
+                chip->fw_cache[fw_index] = *fw_entry;
+#endif
         return err;
 }
 
+
+
 static void free_firmware(const struct firmware *fw_entry)
 {
+#ifdef CONFIG_PM
+        DE_ACT(("firmware not released (kept in cache)\n"));
+#else
         release_firmware(fw_entry);
         DE_ACT(("firmware released\n"));
+#endif
+}
+
+
+
+static void free_firmware_cache(struct echoaudio *chip)
+{
+#ifdef CONFIG_PM
+        int i;
+
+        for (i = 0; i < 8 ; i++)
+                if (chip->fw_cache[i]) {
+                        release_firmware(chip->fw_cache[i]);
+                        DE_ACT(("release_firmware(%d)\n", i));
+                }
+
+        DE_ACT(("firmware_cache released\n"));
+#endif
 }
 
 
@@ -714,6 +753,8 @@ static int pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 
         spin_lock(&chip->lock);
         switch (cmd) {
+        case SNDRV_PCM_TRIGGER_RESUME:
+                DE_ACT(("pcm_trigger resume\n"));
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
                 DE_ACT(("pcm_trigger start\n"));
@@ -737,6 +778,8 @@ static int pcm_trigger(struct snd_pcm_substream *substream, int cmd)
                 err = start_transport(chip, channelmask,
                                       chip->pipe_cyclic_mask);
                 break;
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+                DE_ACT(("pcm_trigger suspend\n"));
         case SNDRV_PCM_TRIGGER_STOP:
                 DE_ACT(("pcm_trigger stop\n"));
                 for (i = 0; i < DSP_MAXPIPES; i++) {
@@ -1821,7 +1864,9 @@ static irqreturn_t snd_echo_interrupt(int irq, void *dev_id)
         /* The hardware doesn't tell us which substream caused the irq,
         thus we have to check all running substreams. */
         for (ss = 0; ss < DSP_MAXPIPES; ss++) {
-                if ((substream = chip->substream[ss])) {
+                substream = chip->substream[ss];
+                if (substream && ((struct audiopipe *)substream->runtime->
+                                private_data)->state == PIPE_STATE_STARTED) {
                         period = pcm_pointer(substream) /
                                 substream->runtime->period_size;
                         if (period != chip->last_period[ss]) {
@@ -1874,6 +1919,7 @@ static int snd_echo_free(struct echoaudio *chip)
         pci_disable_device(chip->pci);
 
         /* release chip data */
+        free_firmware_cache(chip);
         kfree(chip);
         DE_INIT(("Chip freed.\n"));
         return 0;
@@ -1911,18 +1957,27 @@ static __devinit int snd_echo_create(struct snd_card *card,
                 return err;
         pci_set_master(pci);
 
-        /* allocate a chip-specific data */
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (!chip) {
-                pci_disable_device(pci);
-                return -ENOMEM;
+        /* Allocate chip if needed */
+        if (!*rchip) {
+                chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+                if (!chip) {
+                        pci_disable_device(pci);
+                        return -ENOMEM;
+                }
+                DE_INIT(("chip=%p\n", chip));
+                spin_lock_init(&chip->lock);
+                chip->card = card;
+                chip->pci = pci;
+                chip->irq = -1;
+                atomic_set(&chip->opencount, 0);
+                mutex_init(&chip->mode_mutex);
+                chip->can_set_rate = 1;
+        } else {
+                /* If this was called from the resume function, chip is
+                 * already allocated and it contains current card settings.
+                 */
+                chip = *rchip;
         }
-        DE_INIT(("chip=%p\n", chip));
-
-        spin_lock_init(&chip->lock);
-        chip->card = card;
-        chip->pci = pci;
-        chip->irq = -1;
 
         /* PCI resource allocation */
         chip->dsp_registers_phys = pci_resource_start(pci, 0);
@@ -1962,7 +2017,9 @@ static __devinit int snd_echo_create(struct snd_card *card,
         chip->comm_page = (struct comm_page *)chip->commpage_dma_buf.area;
 
         err = init_hw(chip, chip->pci->device, chip->pci->subsystem_device);
-        if (err) {
+        if (err >= 0)
+                err = set_mixer_defaults(chip);
+        if (err < 0) {
                 DE_INIT(("init_hw err=%d\n", err));
                 snd_echo_free(chip);
                 return err;
@@ -1973,9 +2030,6 @@ static __devinit int snd_echo_create(struct snd_card *card,
                 snd_echo_free(chip);
                 return err;
         }
-        atomic_set(&chip->opencount, 0);
-        mutex_init(&chip->mode_mutex);
-        chip->can_set_rate = 1;
         *rchip = chip;
         /* Init done ! */
         return 0;
@@ -2008,6 +2062,7 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,
 
         snd_card_set_dev(card, &pci->dev);
 
+        chip = NULL;    /* Tells snd_echo_create to allocate chip */
         if ((err = snd_echo_create(card, pci, &chip)) < 0) {
                 snd_card_free(card);
                 return err;
@@ -2129,10 +2184,9 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,
                         goto ctl_error;
 #endif
 
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
+        err = snd_card_register(card);
+        if (err < 0)
                 goto ctl_error;
-        }
         snd_printk(KERN_INFO "Card registered: %s\n", card->longname);
 
         pci_set_drvdata(pci, chip);
@@ -2147,6 +2201,112 @@ ctl_error:
 
 
 
+#if defined(CONFIG_PM)
+
+static int snd_echo_suspend(struct pci_dev *pci, pm_message_t state)
+{
+        struct echoaudio *chip = pci_get_drvdata(pci);
+
+        DE_INIT(("suspend start\n"));
+        snd_pcm_suspend_all(chip->analog_pcm);
+        snd_pcm_suspend_all(chip->digital_pcm);
+
+#ifdef ECHOCARD_HAS_MIDI
+        /* This call can sleep */
+        if (chip->midi_out)
+                snd_echo_midi_output_trigger(chip->midi_out, 0);
+#endif
+        spin_lock_irq(&chip->lock);
+        if (wait_handshake(chip)) {
+                spin_unlock_irq(&chip->lock);
+                return -EIO;
+        }
+        clear_handshake(chip);
+        if (send_vector(chip, DSP_VC_GO_COMATOSE) < 0) {
+                spin_unlock_irq(&chip->lock);
+                return -EIO;
+        }
+        spin_unlock_irq(&chip->lock);
+
+        chip->dsp_code = NULL;
+        free_irq(chip->irq, chip);
+        chip->irq = -1;
+        pci_save_state(pci);
+        pci_disable_device(pci);
+
+        DE_INIT(("suspend done\n"));
+        return 0;
+}
+
+
+
+static int snd_echo_resume(struct pci_dev *pci)
+{
+        struct echoaudio *chip = pci_get_drvdata(pci);
+        struct comm_page *commpage, *commpage_bak;
+        u32 pipe_alloc_mask;
+        int err;
+
+        DE_INIT(("resume start\n"));
+        pci_restore_state(pci);
+        commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);
+        commpage = chip->comm_page;
+        memcpy(commpage_bak, commpage, sizeof(struct comm_page));
+
+        err = init_hw(chip, chip->pci->device, chip->pci->subsystem_device);
+        if (err < 0) {
+                kfree(commpage_bak);
+                DE_INIT(("resume init_hw err=%d\n", err));
+                snd_echo_free(chip);
+                return err;
+        }
+        DE_INIT(("resume init OK\n"));
+
+        /* Temporarily set chip->pipe_alloc_mask=0 otherwise
+         * restore_dsp_settings() fails.
+         */
+        pipe_alloc_mask = chip->pipe_alloc_mask;
+        chip->pipe_alloc_mask = 0;
+        err = restore_dsp_rettings(chip);
+        chip->pipe_alloc_mask = pipe_alloc_mask;
+        if (err < 0) {
+                kfree(commpage_bak);
+                return err;
+        }
+        DE_INIT(("resume restore OK\n"));
+
+        memcpy(&commpage->audio_format, &commpage_bak->audio_format,
+                sizeof(commpage->audio_format));
+        memcpy(&commpage->sglist_addr, &commpage_bak->sglist_addr,
+                sizeof(commpage->sglist_addr));
+        memcpy(&commpage->midi_output, &commpage_bak->midi_output,
+                sizeof(commpage->midi_output));
+        kfree(commpage_bak);
+
+        if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
+                        ECHOCARD_NAME, chip)) {
+                snd_echo_free(chip);
+                snd_printk(KERN_ERR "cannot grab irq\n");
+                return -EBUSY;
+        }
+        chip->irq = pci->irq;
+        DE_INIT(("resume irq=%d\n", chip->irq));
+
+#ifdef ECHOCARD_HAS_MIDI
+        if (chip->midi_input_enabled)
+                enable_midi_input(chip, TRUE);
+        if (chip->midi_out)
+                snd_echo_midi_output_trigger(chip->midi_out, 1);
+#endif
+
+        DE_INIT(("resume done\n"));
+        return 0;
+}
+
+#endif /* CONFIG_PM */
+
+
+
 static void __devexit snd_echo_remove(struct pci_dev *pci)
 {
         struct echoaudio *chip;
@@ -2169,6 +2329,10 @@ static struct pci_driver driver = {
         .id_table = snd_echo_ids,
         .probe = snd_echo_probe,
         .remove = __devexit_p(snd_echo_remove),
+#ifdef CONFIG_PM
+        .suspend = snd_echo_suspend,
+        .resume = snd_echo_resume,
+#endif /* CONFIG_PM */
 };
 
 
diff --git a/sound/pci/echoaudio/echoaudio.h b/sound/pci/echoaudio/echoaudio.h
index f9490ae36c2e..1df974dcb5f4 100644
--- a/sound/pci/echoaudio/echoaudio.h
+++ b/sound/pci/echoaudio/echoaudio.h
@@ -442,13 +442,16 @@ struct echoaudio {
         u16 device_id, subdevice_id;
         u16 *dsp_code;                  /* Current DSP code loaded,
                                          * NULL if nothing loaded */
-        const struct firmware *dsp_code_to_load;/* DSP code to load */
-        const struct firmware *asic_code;       /* Current ASIC code */
+        short dsp_code_to_load;         /* DSP code to load */
+        short asic_code;                /* Current ASIC code */
         u32 comm_page_phys;                     /* Physical address of the
                                                  * memory seen by DSP */
         volatile u32 __iomem *dsp_registers;    /* DSP's register base */
         u32 active_mask;                        /* Chs. active mask or
                                                  * punks out */
+#ifdef CONFIG_PM
+        const struct firmware *fw_cache[8];     /* Cached firmwares */
+#endif
 
 #ifdef ECHOCARD_HAS_MIDI
         u16 mtc_state;                          /* State for MIDI input parsing state machine */
@@ -464,11 +467,13 @@ static int load_firmware(struct echoaudio *chip);
 static int wait_handshake(struct echoaudio *chip);
 static int send_vector(struct echoaudio *chip, u32 command);
 static int get_firmware(const struct firmware **fw_entry,
-                        const struct firmware *frm, struct echoaudio *chip);
+                        struct echoaudio *chip, const short fw_index);
 static void free_firmware(const struct firmware *fw_entry);
 
 #ifdef ECHOCARD_HAS_MIDI
 static int enable_midi_input(struct echoaudio *chip, char enable);
+static void snd_echo_midi_output_trigger(
+                        struct snd_rawmidi_substream *substream, int up);
 static int midi_service_irq(struct echoaudio *chip);
 static int __devinit snd_echo_midi_create(struct snd_card *card,
                                           struct echoaudio *chip);
diff --git a/sound/pci/echoaudio/echoaudio_3g.c b/sound/pci/echoaudio/echoaudio_3g.c
index e32a74897921..658db44ef746 100644
--- a/sound/pci/echoaudio/echoaudio_3g.c
+++ b/sound/pci/echoaudio/echoaudio_3g.c
@@ -227,12 +227,11 @@ static int load_asic(struct echoaudio *chip)
         /* Give the DSP a few milliseconds to settle down */
         mdelay(2);
 
-        err = load_asic_generic(chip, DSP_FNC_LOAD_3G_ASIC,
-                                &card_fw[FW_3G_ASIC]);
+        err = load_asic_generic(chip, DSP_FNC_LOAD_3G_ASIC, FW_3G_ASIC);
         if (err < 0)
                 return err;
 
-        chip->asic_code = &card_fw[FW_3G_ASIC];
+        chip->asic_code = FW_3G_ASIC;
 
         /* Now give the new ASIC some time to set up */
         msleep(1000);
diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c
index 4df51ef5e095..64417a733220 100644
--- a/sound/pci/echoaudio/echoaudio_dsp.c
+++ b/sound/pci/echoaudio/echoaudio_dsp.c
@@ -175,15 +175,15 @@ static inline int check_asic_status(struct echoaudio *chip)
 #ifdef ECHOCARD_HAS_ASIC
 
 /* Load ASIC code - done after the DSP is loaded */
-static int load_asic_generic(struct echoaudio *chip, u32 cmd,
-                             const struct firmware *asic)
+static int load_asic_generic(struct echoaudio *chip, u32 cmd, short asic)
 {
         const struct firmware *fw;
         int err;
         u32 i, size;
         u8 *code;
 
-        if ((err = get_firmware(&fw, asic, chip)) < 0) {
+        err = get_firmware(&fw, chip, asic);
+        if (err < 0) {
                 snd_printk(KERN_WARNING "Firmware not found !\n");
                 return err;
         }
@@ -245,7 +245,8 @@ static int install_resident_loader(struct echoaudio *chip)
                 return 0;
         }
 
-        if ((i = get_firmware(&fw, &card_fw[FW_361_LOADER], chip)) < 0) {
+        i = get_firmware(&fw, chip, FW_361_LOADER);
+        if (i < 0) {
                 snd_printk(KERN_WARNING "Firmware not found !\n");
                 return i;
         }
@@ -485,7 +486,8 @@ static int load_firmware(struct echoaudio *chip)
                 chip->dsp_code = NULL;
         }
 
-        if ((err = get_firmware(&fw, chip->dsp_code_to_load, chip)) < 0)
+        err = get_firmware(&fw, chip, chip->dsp_code_to_load);
+        if (err < 0)
                 return err;
         err = load_dsp(chip, (u16 *)fw->data);
         free_firmware(fw);
@@ -495,9 +497,6 @@ static int load_firmware(struct echoaudio *chip)
         if ((box_type = load_asic(chip)) < 0)
                 return box_type;        /* error */
 
-        if ((err = restore_dsp_rettings(chip)) < 0)
-                return err;
-
         return box_type;
 }
 
@@ -657,51 +656,106 @@ static void get_audio_meters(struct echoaudio *chip, long *meters)
 
 static int restore_dsp_rettings(struct echoaudio *chip)
 {
-        int err;
+        int i, o, err;
         DE_INIT(("restore_dsp_settings\n"));
 
         if ((err = check_asic_status(chip)) < 0)
                 return err;
 
-        /* @ Gina20/Darla20 only. Should be harmless for other cards. */
+        /* Gina20/Darla20 only. Should be harmless for other cards. */
         chip->comm_page->gd_clock_state = GD_CLOCK_UNDEF;
         chip->comm_page->gd_spdif_status = GD_SPDIF_STATUS_UNDEF;
         chip->comm_page->handshake = 0xffffffff;
 
-        if ((err = set_sample_rate(chip, chip->sample_rate)) < 0)
+        /* Restore output busses */
+        for (i = 0; i < num_busses_out(chip); i++) {
+                err = set_output_gain(chip, i, chip->output_gain[i]);
+                if (err < 0)
+                        return err;
+        }
+
+#ifdef ECHOCARD_HAS_VMIXER
+        for (i = 0; i < num_pipes_out(chip); i++)
+                for (o = 0; o < num_busses_out(chip); o++) {
+                        err = set_vmixer_gain(chip, o, i,
+                                                chip->vmixer_gain[o][i]);
+                        if (err < 0)
+                                return err;
+                }
+        if (update_vmixer_level(chip) < 0)
+                return -EIO;
+#endif /* ECHOCARD_HAS_VMIXER */
+
+#ifdef ECHOCARD_HAS_MONITOR
+        for (o = 0; o < num_busses_out(chip); o++)
+                for (i = 0; i < num_busses_in(chip); i++) {
+                        err = set_monitor_gain(chip, o, i,
+                                                chip->monitor_gain[o][i]);
+                        if (err < 0)
+                                return err;
+                }
+#endif /* ECHOCARD_HAS_MONITOR */
+
+#ifdef ECHOCARD_HAS_INPUT_GAIN
+        for (i = 0; i < num_busses_in(chip); i++) {
+                err = set_input_gain(chip, i, chip->input_gain[i]);
+                if (err < 0)
+                        return err;
+        }
+#endif /* ECHOCARD_HAS_INPUT_GAIN */
+
+        err = update_output_line_level(chip);
+        if (err < 0)
                 return err;
 
-        if (chip->meters_enabled)
-                if (send_vector(chip, DSP_VC_METERS_ON) < 0)
-                        return -EIO;
+        err = update_input_line_level(chip);
+        if (err < 0)
+                return err;
 
-#ifdef ECHOCARD_HAS_EXTERNAL_CLOCK
-        if (set_input_clock(chip, chip->input_clock) < 0)
+        err = set_sample_rate(chip, chip->sample_rate);
+        if (err < 0)
+                return err;
+
+        if (chip->meters_enabled) {
+                err = send_vector(chip, DSP_VC_METERS_ON);
+                if (err < 0)
+                        return err;
+        }
+
+#ifdef ECHOCARD_HAS_DIGITAL_MODE_SWITCH
+        if (set_digital_mode(chip, chip->digital_mode) < 0)
                 return -EIO;
 #endif
 
-#ifdef ECHOCARD_HAS_OUTPUT_CLOCK_SWITCH
-        if (set_output_clock(chip, chip->output_clock) < 0)
+#ifdef ECHOCARD_HAS_DIGITAL_IO
+        if (set_professional_spdif(chip, chip->professional_spdif) < 0)
                 return -EIO;
 #endif
 
-        if (update_output_line_level(chip) < 0)
+#ifdef ECHOCARD_HAS_PHANTOM_POWER
+        if (set_phantom_power(chip, chip->phantom_power) < 0)
                 return -EIO;
+#endif
 
-        if (update_input_line_level(chip) < 0)
+#ifdef ECHOCARD_HAS_EXTERNAL_CLOCK
+        /* set_input_clock() also restores automute setting */
+        if (set_input_clock(chip, chip->input_clock) < 0)
                 return -EIO;
+#endif
 
-#ifdef ECHOCARD_HAS_VMIXER
-        if (update_vmixer_level(chip) < 0)
+#ifdef ECHOCARD_HAS_OUTPUT_CLOCK_SWITCH
+        if (set_output_clock(chip, chip->output_clock) < 0)
                 return -EIO;
 #endif
 
         if (wait_handshake(chip) < 0)
                 return -EIO;
         clear_handshake(chip);
+        if (send_vector(chip, DSP_VC_UPDATE_FLAGS) < 0)
+                return -EIO;
 
         DE_INIT(("restore_dsp_rettings done\n"));
-        return send_vector(chip, DSP_VC_UPDATE_FLAGS);
+        return 0;
 }
 
 
@@ -918,9 +972,6 @@ static int init_dsp_comm_page(struct echoaudio *chip)
         chip->card_name = ECHOCARD_NAME;
         chip->bad_board = TRUE; /* Set TRUE until DSP loaded */
         chip->dsp_code = NULL;  /* Current DSP code not loaded */
-        chip->digital_mode = DIGITAL_MODE_NONE;
-        chip->input_clock = ECHO_CLOCK_INTERNAL;
-        chip->output_clock = ECHO_CLOCK_WORD;
         chip->asic_loaded = FALSE;
         memset(chip->comm_page, 0, sizeof(struct comm_page));
 
@@ -931,7 +982,6 @@ static int init_dsp_comm_page(struct echoaudio *chip)
         chip->comm_page->midi_out_free_count =
                 cpu_to_le32(DSP_MIDI_OUT_FIFO_SIZE);
         chip->comm_page->sample_rate = cpu_to_le32(44100);
-        chip->sample_rate = 44100;
 
         /* Set line levels so we don't blast any inputs on startup */
         memset(chip->comm_page->monitors, ECHOGAIN_MUTED, MONITOR_ARRAY_SIZE);
@@ -942,50 +992,21 @@ static int init_dsp_comm_page(struct echoaudio *chip)
 
 
 
-/* This function initializes the several volume controls for busses and pipes.
-This MUST be called after the DSP is up and running ! */
+/* This function initializes the chip structure with default values, ie. all
+ * muted and internal clock source. Then it copies the settings to the DSP.
+ * This MUST be called after the DSP is up and running !
+ */
 static int init_line_levels(struct echoaudio *chip)
 {
-        int st, i, o;
-
         DE_INIT(("init_line_levels\n"));
-
-        /* Mute output busses */
-        for (i = 0; i < num_busses_out(chip); i++)
-                if ((st = set_output_gain(chip, i, ECHOGAIN_MUTED)))
-                        return st;
-        if ((st = update_output_line_level(chip)))
-                return st;
-
-#ifdef ECHOCARD_HAS_VMIXER
-        /* Mute the Vmixer */
-        for (i = 0; i < num_pipes_out(chip); i++)
-                for (o = 0; o < num_busses_out(chip); o++)
-                        if ((st = set_vmixer_gain(chip, o, i, ECHOGAIN_MUTED)))
-                                return st;
-        if ((st = update_vmixer_level(chip)))
-                return st;
-#endif /* ECHOCARD_HAS_VMIXER */
-
-#ifdef ECHOCARD_HAS_MONITOR
-        /* Mute the monitor mixer */
-        for (o = 0; o < num_busses_out(chip); o++)
-                for (i = 0; i < num_busses_in(chip); i++)
-                        if ((st = set_monitor_gain(chip, o, i, ECHOGAIN_MUTED)))
-                                return st;
-        if ((st = update_output_line_level(chip)))
-                return st;
-#endif /* ECHOCARD_HAS_MONITOR */
-
-#ifdef ECHOCARD_HAS_INPUT_GAIN
-        for (i = 0; i < num_busses_in(chip); i++)
-                if ((st = set_input_gain(chip, i, ECHOGAIN_MUTED)))
-                        return st;
-        if ((st = update_input_line_level(chip)))
-                return st;
-#endif /* ECHOCARD_HAS_INPUT_GAIN */
-
-        return 0;
+        memset(chip->output_gain, ECHOGAIN_MUTED, sizeof(chip->output_gain));
+        memset(chip->input_gain, ECHOGAIN_MUTED, sizeof(chip->input_gain));
+        memset(chip->monitor_gain, ECHOGAIN_MUTED, sizeof(chip->monitor_gain));
+        memset(chip->vmixer_gain, ECHOGAIN_MUTED, sizeof(chip->vmixer_gain));
+        chip->input_clock = ECHO_CLOCK_INTERNAL;
+        chip->output_clock = ECHO_CLOCK_WORD;
+        chip->sample_rate = 44100;
+        return restore_dsp_rettings(chip);
 }
 
 
diff --git a/sound/pci/echoaudio/gina20.c b/sound/pci/echoaudio/gina20.c
index c0e64b8f52a4..050e54aa693f 100644
--- a/sound/pci/echoaudio/gina20.c
+++ b/sound/pci/echoaudio/gina20.c
@@ -44,9 +44,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -67,7 +67,7 @@ static const struct firmware card_fw[] = {
         {0, "gina20_dsp.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x1801, 0xECC0, 0x0020, 0, 0, 0},      /* DSP 56301 Gina20 rev.0 */
         {0,}
 };
diff --git a/sound/pci/echoaudio/gina20_dsp.c b/sound/pci/echoaudio/gina20_dsp.c
index 3f1e7475faea..d1615a0579d1 100644
--- a/sound/pci/echoaudio/gina20_dsp.c
+++ b/sound/pci/echoaudio/gina20_dsp.c
@@ -49,7 +49,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->device_id = device_id;
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_GINA20_DSP];
+        chip->dsp_code_to_load = FW_GINA20_DSP;
         chip->spdif_status = GD_SPDIF_STATUS_UNDEF;
         chip->clock_state = GD_CLOCK_UNDEF;
         /* Since this card has no ASIC, mark it as loaded so everything
@@ -62,17 +62,20 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        if ((err = init_line_levels(chip)) < 0)
-                return err;
-
-        err = set_professional_spdif(chip, TRUE);
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        chip->professional_spdif = FALSE;
+        return init_line_levels(chip);
+}
+
+
+
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
         u32 clocks_from_dsp, clock_bits;
diff --git a/sound/pci/echoaudio/gina24.c b/sound/pci/echoaudio/gina24.c
index c36a78dd0b5e..5748fc6d29d6 100644
--- a/sound/pci/echoaudio/gina24.c
+++ b/sound/pci/echoaudio/gina24.c
@@ -50,9 +50,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -85,7 +85,7 @@ static const struct firmware card_fw[] = {
         {0, "gina24_361_asic.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x1801, 0xECC0, 0x0050, 0, 0, 0},      /* DSP 56301 Gina24 rev.0 */
         {0x1057, 0x1801, 0xECC0, 0x0051, 0, 0, 0},      /* DSP 56301 Gina24 rev.1 */
         {0x1057, 0x3410, 0xECC0, 0x0050, 0, 0, 0},      /* DSP 56361 Gina24 rev.0 */
diff --git a/sound/pci/echoaudio/gina24_dsp.c b/sound/pci/echoaudio/gina24_dsp.c
index 2fef37a2a5b9..98f7cfa81b5f 100644
--- a/sound/pci/echoaudio/gina24_dsp.c
+++ b/sound/pci/echoaudio/gina24_dsp.c
@@ -33,8 +33,7 @@ static int write_control_reg(struct echoaudio *chip, u32 value, char force);
 static int set_input_clock(struct echoaudio *chip, u16 clock);
 static int set_professional_spdif(struct echoaudio *chip, char prof);
 static int set_digital_mode(struct echoaudio *chip, u8 mode);
-static int load_asic_generic(struct echoaudio *chip, u32 cmd,
-                             const struct firmware *asic);
+static int load_asic_generic(struct echoaudio *chip, u32 cmd, short asic);
 static int check_asic_status(struct echoaudio *chip);
 
 
@@ -58,19 +57,16 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 ECHO_CLOCK_BIT_INTERNAL | ECHO_CLOCK_BIT_SPDIF |
                 ECHO_CLOCK_BIT_ESYNC | ECHO_CLOCK_BIT_ESYNC96 |
                 ECHO_CLOCK_BIT_ADAT;
-        chip->professional_spdif = FALSE;
-        chip->digital_in_automute = TRUE;
-        chip->digital_mode = DIGITAL_MODE_SPDIF_RCA;
 
         /* Gina24 comes in both '301 and '361 flavors */
         if (chip->device_id == DEVICE_ID_56361) {
-                chip->dsp_code_to_load = &card_fw[FW_GINA24_361_DSP];
+                chip->dsp_code_to_load = FW_GINA24_361_DSP;
                 chip->digital_modes =
                         ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_RCA |
                         ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_OPTICAL |
                         ECHOCAPS_HAS_DIGITAL_MODE_ADAT;
         } else {
-                chip->dsp_code_to_load = &card_fw[FW_GINA24_301_DSP];
+                chip->dsp_code_to_load = FW_GINA24_301_DSP;
                 chip->digital_modes =
                         ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_RCA |
                         ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_OPTICAL |
@@ -82,19 +78,22 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        if ((err = init_line_levels(chip)) < 0)
-                return err;
-        err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
-        if (err < 0)
-                return err;
-        err = set_professional_spdif(chip, TRUE);
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        chip->digital_mode = DIGITAL_MODE_SPDIF_RCA;
+        chip->professional_spdif = FALSE;
+        chip->digital_in_automute = TRUE;
+        return init_line_levels(chip);
+}
+
+
+
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
         u32 clocks_from_dsp, clock_bits;
@@ -125,7 +124,7 @@ static int load_asic(struct echoaudio *chip)
 {
         u32 control_reg;
         int err;
-        const struct firmware *fw;
+        short asic;
 
         if (chip->asic_loaded)
                 return 1;
@@ -135,14 +134,15 @@ static int load_asic(struct echoaudio *chip)
 
         /* Pick the correct ASIC for '301 or '361 Gina24 */
         if (chip->device_id == DEVICE_ID_56361)
-                fw = &card_fw[FW_GINA24_361_ASIC];
+                asic = FW_GINA24_361_ASIC;
         else
-                fw = &card_fw[FW_GINA24_301_ASIC];
+                asic = FW_GINA24_301_ASIC;
 
-        if ((err = load_asic_generic(chip, DSP_FNC_LOAD_GINA24_ASIC, fw)) < 0)
+        err = load_asic_generic(chip, DSP_FNC_LOAD_GINA24_ASIC, asic);
+        if (err < 0)
                 return err;
 
-        chip->asic_code = fw;
+        chip->asic_code = asic;
 
         /* Now give the new ASIC a little time to set up */
         mdelay(10);
diff --git a/sound/pci/echoaudio/indigo.c b/sound/pci/echoaudio/indigo.c
index 0a58a7c1fd7c..4ae5e35cb5f1 100644
--- a/sound/pci/echoaudio/indigo.c
+++ b/sound/pci/echoaudio/indigo.c
@@ -42,9 +42,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -68,7 +68,7 @@ static const struct firmware card_fw[] = {
         {0, "indigo_dsp.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x3410, 0xECC0, 0x0090, 0, 0, 0},      /* Indigo */
         {0,}
 };
diff --git a/sound/pci/echoaudio/indigo_dsp.c b/sound/pci/echoaudio/indigo_dsp.c
index 0b2cd9c86277..5e85f14fe5a8 100644
--- a/sound/pci/echoaudio/indigo_dsp.c
+++ b/sound/pci/echoaudio/indigo_dsp.c
@@ -50,7 +50,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->device_id = device_id;
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_INDIGO_DSP];
+        chip->dsp_code_to_load = FW_INDIGO_DSP;
         /* Since this card has no ASIC, mark it as loaded so everything
            works OK */
         chip->asic_loaded = TRUE;
@@ -60,15 +60,19 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        if ((err = init_line_levels(chip)) < 0)
-                return err;
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        return init_line_levels(chip);
+}
+
+
+
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
         return ECHO_CLOCK_BIT_INTERNAL;
diff --git a/sound/pci/echoaudio/indigo_express_dsp.c b/sound/pci/echoaudio/indigo_express_dsp.c
index 9ab625e15652..2e4ab3e34a74 100644
--- a/sound/pci/echoaudio/indigo_express_dsp.c
+++ b/sound/pci/echoaudio/indigo_express_dsp.c
@@ -61,6 +61,7 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)
 
         control_reg |= clock;
         if (control_reg != old_control_reg) {
+                DE_ACT(("set_sample_rate: %d clock %d\n", rate, clock));
                 chip->comm_page->control_register = cpu_to_le32(control_reg);
                 chip->sample_rate = rate;
                 clear_handshake(chip);
diff --git a/sound/pci/echoaudio/indigodj.c b/sound/pci/echoaudio/indigodj.c
index 2db24d29332b..3550715bab1c 100644
--- a/sound/pci/echoaudio/indigodj.c
+++ b/sound/pci/echoaudio/indigodj.c
@@ -42,9 +42,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -68,7 +68,7 @@ static const struct firmware card_fw[] = {
         {0, "indigo_dj_dsp.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x3410, 0xECC0, 0x00B0, 0, 0, 0},      /* Indigo DJ*/
         {0,}
 };
diff --git a/sound/pci/echoaudio/indigodj_dsp.c b/sound/pci/echoaudio/indigodj_dsp.c
index 08392916691e..68f3c8ccc1bf 100644
--- a/sound/pci/echoaudio/indigodj_dsp.c
+++ b/sound/pci/echoaudio/indigodj_dsp.c
@@ -50,7 +50,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->device_id = device_id;
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_INDIGO_DJ_DSP];
+        chip->dsp_code_to_load = FW_INDIGO_DJ_DSP;
         /* Since this card has no ASIC, mark it as loaded so everything
            works OK */
         chip->asic_loaded = TRUE;
@@ -60,15 +60,19 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        if ((err = init_line_levels(chip)) < 0)
-                return err;
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        return init_line_levels(chip);
+}
+
+
+
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
         return ECHO_CLOCK_BIT_INTERNAL;
diff --git a/sound/pci/echoaudio/indigodjx.c b/sound/pci/echoaudio/indigodjx.c
index 2e44316530a2..19b191fd0120 100644
--- a/sound/pci/echoaudio/indigodjx.c
+++ b/sound/pci/echoaudio/indigodjx.c
@@ -42,10 +42,10 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -68,7 +68,7 @@ static const struct firmware card_fw[] = {
         {0, "indigo_djx_dsp.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x3410, 0xECC0, 0x00E0, 0, 0, 0},      /* Indigo DJx*/
         {0,}
 };
diff --git a/sound/pci/echoaudio/indigodjx_dsp.c b/sound/pci/echoaudio/indigodjx_dsp.c
index f591fc2ed960..bb9632c752a9 100644
--- a/sound/pci/echoaudio/indigodjx_dsp.c
+++ b/sound/pci/echoaudio/indigodjx_dsp.c
@@ -48,7 +48,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->device_id = device_id;
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_INDIGO_DJX_DSP];
+        chip->dsp_code_to_load = FW_INDIGO_DJX_DSP;
         /* Since this card has no ASIC, mark it as loaded so everything
            works OK */
         chip->asic_loaded = TRUE;
@@ -59,10 +59,13 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        err = init_line_levels(chip);
-        if (err < 0)
-                return err;
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
+
+
+
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        return init_line_levels(chip);
+}
diff --git a/sound/pci/echoaudio/indigoio.c b/sound/pci/echoaudio/indigoio.c
index a60c0a0a89b7..a9fcedf317a4 100644
--- a/sound/pci/echoaudio/indigoio.c
+++ b/sound/pci/echoaudio/indigoio.c
@@ -43,9 +43,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -69,7 +69,7 @@ static const struct firmware card_fw[] = {
         {0, "indigo_io_dsp.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x3410, 0xECC0, 0x00A0, 0, 0, 0},      /* Indigo IO*/
         {0,}
 };
diff --git a/sound/pci/echoaudio/indigoio_dsp.c b/sound/pci/echoaudio/indigoio_dsp.c
index 0604c8a85223..beb9a5b69892 100644
--- a/sound/pci/echoaudio/indigoio_dsp.c
+++ b/sound/pci/echoaudio/indigoio_dsp.c
@@ -50,7 +50,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->device_id = device_id;
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_INDIGO_IO_DSP];
+        chip->dsp_code_to_load = FW_INDIGO_IO_DSP;
         /* Since this card has no ASIC, mark it as loaded so everything
            works OK */
         chip->asic_loaded = TRUE;
@@ -60,15 +60,19 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        if ((err = init_line_levels(chip)) < 0)
-                return err;
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        return init_line_levels(chip);
+}
+
+
+
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
         return ECHO_CLOCK_BIT_INTERNAL;
diff --git a/sound/pci/echoaudio/indigoiox.c b/sound/pci/echoaudio/indigoiox.c
index eb3819f9654a..bcdfac63212c 100644
--- a/sound/pci/echoaudio/indigoiox.c
+++ b/sound/pci/echoaudio/indigoiox.c
@@ -43,10 +43,10 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -69,7 +69,7 @@ static const struct firmware card_fw[] = {
         {0, "indigo_iox_dsp.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x3410, 0xECC0, 0x00D0, 0, 0, 0},      /* Indigo IOx */
         {0,}
 };
diff --git a/sound/pci/echoaudio/indigoiox_dsp.c b/sound/pci/echoaudio/indigoiox_dsp.c
index f357521c79e6..394c6e76bcbc 100644
--- a/sound/pci/echoaudio/indigoiox_dsp.c
+++ b/sound/pci/echoaudio/indigoiox_dsp.c
@@ -48,7 +48,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->device_id = device_id;
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_INDIGO_IOX_DSP];
+        chip->dsp_code_to_load = FW_INDIGO_IOX_DSP;
         /* Since this card has no ASIC, mark it as loaded so everything
            works OK */
         chip->asic_loaded = TRUE;
@@ -59,10 +59,13 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        err = init_line_levels(chip);
-        if (err < 0)
-                return err;
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
+
+
+
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        return init_line_levels(chip);
+}
diff --git a/sound/pci/echoaudio/layla20.c b/sound/pci/echoaudio/layla20.c
index 506194688995..d3a98c5dac86 100644
--- a/sound/pci/echoaudio/layla20.c
+++ b/sound/pci/echoaudio/layla20.c
@@ -49,9 +49,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -76,7 +76,7 @@ static const struct firmware card_fw[] = {
         {0, "layla20_asic.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x1801, 0xECC0, 0x0030, 0, 0, 0},      /* DSP 56301 Layla20 rev.0 */
         {0x1057, 0x1801, 0xECC0, 0x0031, 0, 0, 0},      /* DSP 56301 Layla20 rev.1 */
         {0,}
diff --git a/sound/pci/echoaudio/layla20_dsp.c b/sound/pci/echoaudio/layla20_dsp.c
index 83750e9fd7b4..53ce94605044 100644
--- a/sound/pci/echoaudio/layla20_dsp.c
+++ b/sound/pci/echoaudio/layla20_dsp.c
@@ -31,8 +31,7 @@
 
 static int read_dsp(struct echoaudio *chip, u32 *data);
 static int set_professional_spdif(struct echoaudio *chip, char prof);
-static int load_asic_generic(struct echoaudio *chip, u32 cmd,
-                             const struct firmware *asic);
+static int load_asic_generic(struct echoaudio *chip, u32 cmd, short asic);
 static int check_asic_status(struct echoaudio *chip);
 static int update_flags(struct echoaudio *chip);
 
@@ -54,7 +53,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
         chip->has_midi = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_LAYLA20_DSP];
+        chip->dsp_code_to_load = FW_LAYLA20_DSP;
         chip->input_clock_types =
                 ECHO_CLOCK_BIT_INTERNAL | ECHO_CLOCK_BIT_SPDIF |
                 ECHO_CLOCK_BIT_WORD | ECHO_CLOCK_BIT_SUPER;
@@ -65,17 +64,20 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        if ((err = init_line_levels(chip)) < 0)
-                return err;
-
-        err = set_professional_spdif(chip, TRUE);
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        chip->professional_spdif = FALSE;
+        return init_line_levels(chip);
+}
+
+
+
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
         u32 clocks_from_dsp, clock_bits;
@@ -144,7 +146,7 @@ static int load_asic(struct echoaudio *chip)
                 return 0;
 
         err = load_asic_generic(chip, DSP_FNC_LOAD_LAYLA_ASIC,
-                                &card_fw[FW_LAYLA20_ASIC]);
+                                FW_LAYLA20_ASIC);
         if (err < 0)
                 return err;
 
diff --git a/sound/pci/echoaudio/layla24.c b/sound/pci/echoaudio/layla24.c
index e09e3ea7781e..2a1dca6dce17 100644
--- a/sound/pci/echoaudio/layla24.c
+++ b/sound/pci/echoaudio/layla24.c
@@ -51,9 +51,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -87,7 +87,7 @@ static const struct firmware card_fw[] = {
         {0, "layla24_2S_asic.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x3410, 0xECC0, 0x0060, 0, 0, 0},      /* DSP 56361 Layla24 rev.0 */
         {0,}
 };
diff --git a/sound/pci/echoaudio/layla24_dsp.c b/sound/pci/echoaudio/layla24_dsp.c
index d61b5cbcccad..8c041647f285 100644
--- a/sound/pci/echoaudio/layla24_dsp.c
+++ b/sound/pci/echoaudio/layla24_dsp.c
@@ -32,8 +32,7 @@ static int write_control_reg(struct echoaudio *chip, u32 value, char force);
 static int set_input_clock(struct echoaudio *chip, u16 clock);
 static int set_professional_spdif(struct echoaudio *chip, char prof);
 static int set_digital_mode(struct echoaudio *chip, u8 mode);
-static int load_asic_generic(struct echoaudio *chip, u32 cmd,
-                             const struct firmware *asic);
+static int load_asic_generic(struct echoaudio *chip, u32 cmd, short asic);
 static int check_asic_status(struct echoaudio *chip);
 
 
@@ -54,7 +53,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
         chip->has_midi = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_LAYLA24_DSP];
+        chip->dsp_code_to_load = FW_LAYLA24_DSP;
         chip->input_clock_types =
                 ECHO_CLOCK_BIT_INTERNAL | ECHO_CLOCK_BIT_SPDIF |
                 ECHO_CLOCK_BIT_WORD | ECHO_CLOCK_BIT_ADAT;
@@ -62,9 +61,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_RCA |
                 ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_OPTICAL |
                 ECHOCAPS_HAS_DIGITAL_MODE_ADAT;
-        chip->digital_mode =            DIGITAL_MODE_SPDIF_RCA;
-        chip->professional_spdif = FALSE;
-        chip->digital_in_automute = TRUE;
 
         if ((err = load_firmware(chip)) < 0)
                 return err;
@@ -73,17 +69,22 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         if ((err = init_line_levels(chip)) < 0)
                 return err;
 
-        err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
-        if (err < 0)
-                return err;
-        err = set_professional_spdif(chip, TRUE);
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        chip->digital_mode = DIGITAL_MODE_SPDIF_RCA;
+        chip->professional_spdif = FALSE;
+        chip->digital_in_automute = TRUE;
+        return init_line_levels(chip);
+}
+
+
+
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
         u32 clocks_from_dsp, clock_bits;
@@ -123,18 +124,18 @@ static int load_asic(struct echoaudio *chip)
 
         /* Load the ASIC for the PCI card */
         err = load_asic_generic(chip, DSP_FNC_LOAD_LAYLA24_PCI_CARD_ASIC,
-                                &card_fw[FW_LAYLA24_1_ASIC]);
+                                FW_LAYLA24_1_ASIC);
         if (err < 0)
                 return err;
 
-        chip->asic_code = &card_fw[FW_LAYLA24_2S_ASIC];
+        chip->asic_code = FW_LAYLA24_2S_ASIC;
 
         /* Now give the new ASIC a little time to set up */
         mdelay(10);
 
         /* Do the external one */
         err = load_asic_generic(chip, DSP_FNC_LOAD_LAYLA24_EXTERNAL_ASIC,
-                                &card_fw[FW_LAYLA24_2S_ASIC]);
+                                FW_LAYLA24_2S_ASIC);
         if (err < 0)
                 return FALSE;
 
@@ -299,7 +300,7 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)
 /* Depending on what digital mode you want, Layla24 needs different ASICs
 loaded.  This function checks the ASIC needed for the new mode and sees
 if it matches the one already loaded. */
-static int switch_asic(struct echoaudio *chip, const struct firmware *asic)
+static int switch_asic(struct echoaudio *chip, short asic)
 {
         s8 *monitors;
 
@@ -335,7 +336,7 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)
 {
         u32 control_reg;
         int err, incompatible_clock;
-        const struct firmware *asic;
+        short asic;
 
         /* Set clock to "internal" if it's not compatible with the new mode */
         incompatible_clock = FALSE;
@@ -344,12 +345,12 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)
         case DIGITAL_MODE_SPDIF_RCA:
                 if (chip->input_clock == ECHO_CLOCK_ADAT)
                         incompatible_clock = TRUE;
-                asic = &card_fw[FW_LAYLA24_2S_ASIC];
+                asic = FW_LAYLA24_2S_ASIC;
                 break;
         case DIGITAL_MODE_ADAT:
                 if (chip->input_clock == ECHO_CLOCK_SPDIF)
                         incompatible_clock = TRUE;
-                asic = &card_fw[FW_LAYLA24_2A_ASIC];
+                asic = FW_LAYLA24_2A_ASIC;
                 break;
         default:
                 DE_ACT(("Digital mode not supported: %d\n", mode));
diff --git a/sound/pci/echoaudio/mia.c b/sound/pci/echoaudio/mia.c
index f05c8c097aa8..9cdf14cfdd74 100644
--- a/sound/pci/echoaudio/mia.c
+++ b/sound/pci/echoaudio/mia.c
@@ -50,9 +50,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -77,7 +77,7 @@ static const struct firmware card_fw[] = {
         {0, "mia_dsp.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x3410, 0xECC0, 0x0080, 0, 0, 0},      /* DSP 56361 Mia rev.0 */
         {0x1057, 0x3410, 0xECC0, 0x0081, 0, 0, 0},      /* DSP 56361 Mia rev.1 */
         {0,}
diff --git a/sound/pci/echoaudio/mia_dsp.c b/sound/pci/echoaudio/mia_dsp.c
index 551405114cbc..6ebfa6e7ab9e 100644
--- a/sound/pci/echoaudio/mia_dsp.c
+++ b/sound/pci/echoaudio/mia_dsp.c
@@ -53,7 +53,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         chip->device_id = device_id;
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
-        chip->dsp_code_to_load = &card_fw[FW_MIA_DSP];
+        chip->dsp_code_to_load = FW_MIA_DSP;
         /* Since this card has no ASIC, mark it as loaded so everything
            works OK */
         chip->asic_loaded = TRUE;
@@ -66,15 +66,19 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
                 return err;
         chip->bad_board = FALSE;
 
-        if ((err = init_line_levels(chip)))
-                return err;
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        return init_line_levels(chip);
+}
+
+
+
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
         u32 clocks_from_dsp, clock_bits;
diff --git a/sound/pci/echoaudio/mona.c b/sound/pci/echoaudio/mona.c
index b05bad944901..1047be405ebe 100644
--- a/sound/pci/echoaudio/mona.c
+++ b/sound/pci/echoaudio/mona.c
@@ -48,9 +48,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -92,7 +92,7 @@ static const struct firmware card_fw[] = {
         {0, "mona_2_asic.fw"}
 };
 
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
         {0x1057, 0x1801, 0xECC0, 0x0070, 0, 0, 0},      /* DSP 56301 Mona rev.0 */
         {0x1057, 0x1801, 0xECC0, 0x0071, 0, 0, 0},      /* DSP 56301 Mona rev.1 */
         {0x1057, 0x1801, 0xECC0, 0x0072, 0, 0, 0},      /* DSP 56301 Mona rev.2 */
diff --git a/sound/pci/echoaudio/mona_dsp.c b/sound/pci/echoaudio/mona_dsp.c
index eaa619bd2a03..6e6a7eb555b8 100644
--- a/sound/pci/echoaudio/mona_dsp.c
+++ b/sound/pci/echoaudio/mona_dsp.c
@@ -33,8 +33,7 @@ static int write_control_reg(struct echoaudio *chip, u32 value, char force);
 static int set_input_clock(struct echoaudio *chip, u16 clock);
 static int set_professional_spdif(struct echoaudio *chip, char prof);
 static int set_digital_mode(struct echoaudio *chip, u8 mode);
-static int load_asic_generic(struct echoaudio *chip, u32 cmd,
-                             const struct firmware *asic);
+static int load_asic_generic(struct echoaudio *chip, u32 cmd, short asic);
 static int check_asic_status(struct echoaudio *chip);
 
 
@@ -64,32 +63,30 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
 
         /* Mona comes in both '301 and '361 flavors */
         if (chip->device_id == DEVICE_ID_56361)
-                chip->dsp_code_to_load = &card_fw[FW_MONA_361_DSP];
+                chip->dsp_code_to_load = FW_MONA_361_DSP;
         else
-                chip->dsp_code_to_load = &card_fw[FW_MONA_301_DSP];
-
-        chip->digital_mode = DIGITAL_MODE_SPDIF_RCA;
-        chip->professional_spdif = FALSE;
-        chip->digital_in_automute = TRUE;
+                chip->dsp_code_to_load = FW_MONA_301_DSP;
 
         if ((err = load_firmware(chip)) < 0)
                 return err;
         chip->bad_board = FALSE;
 
-        if ((err = init_line_levels(chip)) < 0)
-                return err;
-
-        err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA);
-        if (err < 0)
-                return err;
-        err = set_professional_spdif(chip, TRUE);
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
 
 
 
+static int set_mixer_defaults(struct echoaudio *chip)
+{
+        chip->digital_mode = DIGITAL_MODE_SPDIF_RCA;
+        chip->professional_spdif = FALSE;
+        chip->digital_in_automute = TRUE;
+        return init_line_levels(chip);
+}
+
+
+
 static u32 detect_input_clocks(const struct echoaudio *chip)
 {
         u32 clocks_from_dsp, clock_bits;
@@ -120,7 +117,7 @@ static int load_asic(struct echoaudio *chip)
 {
         u32 control_reg;
         int err;
-        const struct firmware *asic;
+        short asic;
 
         if (chip->asic_loaded)
                 return 0;
@@ -128,9 +125,9 @@ static int load_asic(struct echoaudio *chip)
         mdelay(10);
 
         if (chip->device_id == DEVICE_ID_56361)
-                asic = &card_fw[FW_MONA_361_1_ASIC48];
+                asic = FW_MONA_361_1_ASIC48;
         else
-                asic = &card_fw[FW_MONA_301_1_ASIC48];
+                asic = FW_MONA_301_1_ASIC48;
 
         err = load_asic_generic(chip, DSP_FNC_LOAD_MONA_PCI_CARD_ASIC, asic);
         if (err < 0)
@@ -141,7 +138,7 @@ static int load_asic(struct echoaudio *chip)
 
         /* Do the external one */
         err = load_asic_generic(chip, DSP_FNC_LOAD_MONA_EXTERNAL_ASIC,
-                                &card_fw[FW_MONA_2_ASIC]);
+                                FW_MONA_2_ASIC);
         if (err < 0)
                 return err;
 
@@ -165,22 +162,22 @@ loaded.  This function checks the ASIC needed for the new mode and sees
 if it matches the one already loaded. */
 static int switch_asic(struct echoaudio *chip, char double_speed)
 {
-        const struct firmware *asic;
         int err;
+        short asic;
 
         /* Check the clock detect bits to see if this is
         a single-speed clock or a double-speed clock; load
         a new ASIC if necessary. */
         if (chip->device_id == DEVICE_ID_56361) {
                 if (double_speed)
-                        asic = &card_fw[FW_MONA_361_1_ASIC96];
+                        asic = FW_MONA_361_1_ASIC96;
                 else
-                        asic = &card_fw[FW_MONA_361_1_ASIC48];
+                        asic = FW_MONA_361_1_ASIC48;
         } else {
                 if (double_speed)
-                        asic = &card_fw[FW_MONA_301_1_ASIC96];
+                        asic = FW_MONA_301_1_ASIC96;
                 else
-                        asic = &card_fw[FW_MONA_301_1_ASIC48];
+                        asic = FW_MONA_301_1_ASIC48;
         }
 
         if (asic != chip->asic_code) {
@@ -200,7 +197,7 @@ static int switch_asic(struct echoaudio *chip, char double_speed)
 static int set_sample_rate(struct echoaudio *chip, u32 rate)
 {
         u32 control_reg, clock;
-        const struct firmware *asic;
+        short asic;
         char force_write;
 
         /* Only set the clock for internal mode. */
@@ -218,14 +215,14 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)
                 if (chip->digital_mode == DIGITAL_MODE_ADAT)
                         return -EINVAL;
                 if (chip->device_id == DEVICE_ID_56361)
-                        asic = &card_fw[FW_MONA_361_1_ASIC96];
+                        asic = FW_MONA_361_1_ASIC96;
                 else
-                        asic = &card_fw[FW_MONA_301_1_ASIC96];
+                        asic = FW_MONA_301_1_ASIC96;
         } else {
                 if (chip->device_id == DEVICE_ID_56361)
-                        asic = &card_fw[FW_MONA_361_1_ASIC48];
+                        asic = FW_MONA_361_1_ASIC48;
                 else
-                        asic = &card_fw[FW_MONA_301_1_ASIC48];
+                        asic = FW_MONA_301_1_ASIC48;
         }
 
         force_write = 0;
@@ -410,8 +407,8 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)
         case DIGITAL_MODE_ADAT:
                 /* If the current ASIC is the 96KHz ASIC, switch the ASIC
                    and set to 48 KHz */
-                if (chip->asic_code == &card_fw[FW_MONA_361_1_ASIC96] ||
-                    chip->asic_code == &card_fw[FW_MONA_301_1_ASIC96]) {
+                if (chip->asic_code == FW_MONA_361_1_ASIC96 ||
+                    chip->asic_code == FW_MONA_301_1_ASIC96) {
                         set_sample_rate(chip, 48000);
                 }
                 control_reg |= GML_ADAT_MODE;
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 168af67d938e..4203782d7cb7 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -76,7 +76,7 @@ MODULE_PARM_DESC(subsystem, "Force card subsystem model.");
 /*
  * Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value  Model:SB0400
  */
-static struct pci_device_id snd_emu10k1_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1_ids) = {
         { PCI_VDEVICE(CREATIVE, 0x0002), 0 },   /* EMU10K1 */
         { PCI_VDEVICE(CREATIVE, 0x0004), 1 },   /* Audigy */
         { PCI_VDEVICE(CREATIVE, 0x0008), 1 },   /* Audigy 2 Value SB0400 */
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 36e08bd2b3cc..df47f738098d 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -184,7 +184,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard.");
  * The hardware has 3 channels for playback and 1 for capture.
  *  - channel 0 is the front channel
  *  - channel 1 is the rear channel
- *  - channel 2 is the center/lfe chanel
+ *  - channel 2 is the center/lfe channel
  * Volume is controlled by the AC97 for the front and rear channels by
  * the PCM Playback Volume, Sigmatel Surround Playback Volume and 
  * Surround Playback Volume. The Sigmatel 4-Speaker Stereo switch affects
@@ -1040,8 +1040,7 @@ static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry,
                 if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
                         continue;
 
-                if ((reg < 0x49) && (reg >= 0) && (val <= 0xffffffff) 
-                    && (channel_id >= 0) && (channel_id <= 2) )
+                if (reg < 0x49 && val <= 0xffffffff && channel_id <= 2)
                         snd_emu10k1x_ptr_write(emu, reg, channel_id, val);
         }
 }
@@ -1606,7 +1605,7 @@ static void __devexit snd_emu10k1x_remove(struct pci_dev *pci)
 }
 
 // PCI IDs
-static struct pci_device_id snd_emu10k1x_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1x_ids) = {
         { PCI_VDEVICE(CREATIVE, 0x0006), 0 },   /* Dell OEM version (EMU10K1) */
         { 0, }
 };
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index b0fb6c917c38..05afe06e353a 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -1818,8 +1818,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                 "Master Playback Switch", "Master Capture Switch",
                 "Master Playback Volume", "Master Capture Volume",
                 "Wave Master Playback Volume", "Master Playback Volume",
-                "PC Speaker Playback Switch", "PC Speaker Capture Switch",
-                "PC Speaker Playback Volume", "PC Speaker Capture Volume",
+                "Beep Playback Switch", "Beep Capture Switch",
+                "Beep Playback Volume", "Beep Capture Volume",
                 "Phone Playback Switch", "Phone Capture Switch",
                 "Phone Playback Volume", "Phone Capture Volume",
                 "Mic Playback Switch", "Mic Capture Switch",
diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
index 216f9748aff5..baa7cd508cd8 100644
--- a/sound/pci/emu10k1/emuproc.c
+++ b/sound/pci/emu10k1/emuproc.c
@@ -451,7 +451,7 @@ static void snd_emu_proc_io_reg_write(struct snd_info_entry *entry,
         while (!snd_info_get_line(buffer, line, sizeof(line))) {
                 if (sscanf(line, "%x %x", &reg, &val) != 2)
                         continue;
-                if ((reg < 0x40) && (reg >= 0) && (val <= 0xffffffff) ) {
+                if (reg < 0x40 && val <= 0xffffffff) {
                         spin_lock_irqsave(&emu->emu_lock, flags);
                         outl(val, emu->port + (reg & 0xfffffffc));
                         spin_unlock_irqrestore(&emu->emu_lock, flags);
@@ -527,7 +527,7 @@ static void snd_emu_proc_ptr_reg_write(struct snd_info_entry *entry,
         while (!snd_info_get_line(buffer, line, sizeof(line))) {
                 if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
                         continue;
-                if ((reg < 0xa0) && (reg >= 0) && (val <= 0xffffffff) && (channel_id >= 0) && (channel_id <= 3) )
+                if (reg < 0xa0 && val <= 0xffffffff && channel_id <= 3)
                         snd_ptr_write(emu, iobase, reg, channel_id, val);
         }
 }
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
index c1a5aa15af8f..5ef7080e14d0 100644
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
@@ -256,7 +256,7 @@ int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, u32 reg, u32 value)
         if (reg > 0x3f)
                 return 1;
         reg += 0x40; /* 0x40 upwards are registers. */
-        if (value < 0 || value > 0x3f) /* 0 to 0x3f are values */
+        if (value > 0x3f) /* 0 to 0x3f are values */
                 return 1;
         spin_lock_irqsave(&emu->emu_lock, flags);
         outl(reg, emu->port + A_IOCFG);
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 6a47672f930a..ffb1ddb8dc28 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/pci.h>
+#include <linux/gfp.h>
 #include <linux/time.h>
 #include <linux/mutex.h>
 
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 2b82c5c723e1..c7fba5379813 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -443,7 +443,7 @@ struct ensoniq {
 
 static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id);
 
-static struct pci_device_id snd_audiopci_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_audiopci_ids) = {
 #ifdef CHIP1370
         { PCI_VDEVICE(ENSONIQ, 0x5000), 0, },   /* ES1370 */
 #endif
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 820318ee62c1..553b75217259 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -243,7 +243,7 @@ struct es1938 {
 
 static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id);
 
-static struct pci_device_id snd_es1938_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_es1938_ids) = {
         { PCI_VDEVICE(ESS, 0x1969), 0, },   /* Solo-1 */
         { 0, }
 };
@@ -1387,7 +1387,7 @@ ES1938_DOUBLE_TLV("Aux Playback Volume", 0, 0x3a, 0x3a, 4, 0, 15, 0,
                   db_scale_line),
 ES1938_DOUBLE_TLV("Capture Volume", 0, 0xb4, 0xb4, 4, 0, 15, 0,
                   db_scale_capture),
-ES1938_SINGLE("PC Speaker Volume", 0, 0x3c, 0, 7, 0),
+ES1938_SINGLE("Beep Volume", 0, 0x3c, 0, 7, 0),
 ES1938_SINGLE("Record Monitor", 0, 0xa8, 3, 1, 0),
 ES1938_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1),
 {
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index a11f453a6b6d..ecaea9fb48ec 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -551,7 +551,7 @@ struct es1968 {
 
 static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id);
 
-static struct pci_device_id snd_es1968_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_es1968_ids) = {
         /* Maestro 1 */
         { 0x1285, 0x0100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, TYPE_MAESTRO },
         /* Maestro 2 */
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 60cdb9e0b68d..e1baad74ea4b 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -55,7 +55,7 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card *
  *    1 = MediaForte 256-PCS
  *    2 = MediaForte 256-PCPR
  *    3 = MediaForte 64-PCR
- *   16 = setup tuner only (this is additional bit), i.e. SF-64-PCR FM card
+ *   16 = setup tuner only (this is additional bit), i.e. SF64-PCR FM card
  *  High 16-bits are video (radio) device number + 1
  */
 static int tea575x_tuner[SNDRV_CARDS];
@@ -67,7 +67,10 @@ MODULE_PARM_DESC(id, "ID string for the FM801 soundcard.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable FM801 soundcard.");
 module_param_array(tea575x_tuner, int, NULL, 0444);
-MODULE_PARM_DESC(tea575x_tuner, "Enable TEA575x tuner.");
+MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (1 = SF256-PCS, 2=SF256-PCPR, 3=SF64-PCR, +16=tuner-only).");
+
+#define TUNER_ONLY              (1<<4)
+#define TUNER_TYPE_MASK         (~TUNER_ONLY & 0xFFFF)
 
 /*
  *  Direct registers
@@ -160,7 +163,7 @@ struct fm801 {
         unsigned int multichannel: 1,   /* multichannel support */
                      secondary: 1;      /* secondary codec */
         unsigned char secondary_addr;   /* address of the secondary codec */
-        unsigned int tea575x_tuner;     /* tuner flags */
+        unsigned int tea575x_tuner;     /* tuner access method & flags */
 
         unsigned short ply_ctrl; /* playback control */
         unsigned short cap_ctrl; /* capture control */
@@ -202,7 +205,7 @@ struct fm801 {
 #endif
 };
 
-static struct pci_device_id snd_fm801_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_fm801_ids) = {
         { 0x1319, 0x0801, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, },   /* FM801 */
         { 0x5213, 0x0510, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, },   /* Gallant Odyssey Sound 4 */
         { 0, }
@@ -1287,7 +1290,7 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)
 {
         unsigned short cmdw;
 
-        if (chip->tea575x_tuner & 0x0010)
+        if (chip->tea575x_tuner & TUNER_ONLY)
                 goto __ac97_ok;
 
         /* codec cold reset + AC'97 warm reset */
@@ -1296,11 +1299,13 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)
         udelay(100);
         outw(0, FM801_REG(chip, CODEC_CTRL));
 
-        if (wait_for_codec(chip, 0, AC97_RESET, msecs_to_jiffies(750)) < 0) {
-                snd_printk(KERN_ERR "Primary AC'97 codec not found\n");
-                if (! resume)
-                        return -EIO;
-        }
+        if (wait_for_codec(chip, 0, AC97_RESET, msecs_to_jiffies(750)) < 0)
+                if (!resume) {
+                        snd_printk(KERN_INFO "Primary AC'97 codec not found, "
+                                            "assume SF64-PCR (tuner-only)\n");
+                        chip->tea575x_tuner = 3 | TUNER_ONLY;
+                        goto __ac97_ok;
+                }
 
         if (chip->multichannel) {
                 if (chip->secondary_addr) {
@@ -1414,7 +1419,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
                 return err;
         }
         chip->port = pci_resource_start(pci, 0);
-        if ((tea575x_tuner & 0x0010) == 0) {
+        if ((tea575x_tuner & TUNER_ONLY) == 0) {
                 if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_SHARED,
                                 "FM801", chip)) {
                         snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq);
@@ -1429,6 +1434,14 @@ static int __devinit snd_fm801_create(struct snd_card *card,
                 chip->multichannel = 1;
 
         snd_fm801_chip_init(chip, 0);
+        /* init might set tuner access method */
+        tea575x_tuner = chip->tea575x_tuner;
+
+        if (chip->irq >= 0 && (tea575x_tuner & TUNER_ONLY)) {
+                pci_clear_master(pci);
+                free_irq(chip->irq, chip);
+                chip->irq = -1;
+        }
 
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
                 snd_fm801_free(chip);
@@ -1438,12 +1451,13 @@ static int __devinit snd_fm801_create(struct snd_card *card,
         snd_card_set_dev(card, &pci->dev);
 
 #ifdef TEA575X_RADIO
-        if (tea575x_tuner > 0 && (tea575x_tuner & 0x000f) < 4) {
+        if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&
+            (tea575x_tuner & TUNER_TYPE_MASK) < 4) {
                 chip->tea.dev_nr = tea575x_tuner >> 16;
                 chip->tea.card = card;
                 chip->tea.freq_fixup = 10700;
                 chip->tea.private_data = chip;
-                chip->tea.ops = &snd_fm801_tea_ops[(tea575x_tuner & 0x000f) - 1];
+                chip->tea.ops = &snd_fm801_tea_ops[(tea575x_tuner & TUNER_TYPE_MASK) - 1];
                 snd_tea575x_init(&chip->tea);
         }
 #endif
@@ -1483,7 +1497,7 @@ static int __devinit snd_card_fm801_probe(struct pci_dev *pci,
         sprintf(card->longname, "%s at 0x%lx, irq %i",
                 card->shortname, chip->port, chip->irq);
 
-        if (tea575x_tuner[dev] & 0x0010)
+        if (chip->tea575x_tuner & TUNER_ONLY)
                 goto __fm801_tuner_only;
 
         if ((err = snd_fm801_pcm(chip, 0, NULL)) < 0) {
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 55545e0818b5..567348b05b5a 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -38,9 +38,20 @@ config SND_HDA_INPUT_BEEP
           Say Y here to build a digital beep interface for HD-audio
           driver. This interface is used to generate digital beeps.
 
+config SND_HDA_INPUT_BEEP_MODE
+        int "Digital beep registration mode (0=off, 1=on, 2=mute sw on/off)"
+        depends on SND_HDA_INPUT_BEEP=y
+        default "1"
+        range 0 2
+        help
+          Set 0 to disable the digital beep interface for HD-audio by default.
+          Set 1 to always enable the digital beep interface for HD-audio by
+          default. Set 2 to control the beep device registration to input
+          layer using a "Beep Switch" in mixer applications.
+
 config SND_HDA_INPUT_JACK
         bool "Support jack plugging notification via input layer"
-        depends on INPUT=y || INPUT=SND_HDA_INTEL
+        depends on INPUT=y || INPUT=SND
         select SND_JACK
         help
           Say Y here to enable the jack plugging notification via
@@ -146,7 +157,7 @@ config SND_HDA_CODEC_INTELHDMI
 
 config SND_HDA_ELD
         def_bool y
-        depends on SND_HDA_CODEC_INTELHDMI
+        depends on SND_HDA_CODEC_INTELHDMI || SND_HDA_CODEC_NVHDMI
 
 config SND_HDA_CODEC_CIRRUS
         bool "Build Cirrus Logic codec support"
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index 315a1c4f8998..24bc195b02da 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -3,7 +3,7 @@ snd-hda-intel-objs := hda_intel.o
 snd-hda-codec-y := hda_codec.o
 snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o
 snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o
-# snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o
+snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o
 snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
 snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
 
@@ -18,7 +18,7 @@ snd-hda-codec-ca0110-objs :=	patch_ca0110.o
 snd-hda-codec-conexant-objs :=  patch_conexant.o
 snd-hda-codec-via-objs :=       patch_via.o
 snd-hda-codec-nvhdmi-objs :=    patch_nvhdmi.o
-snd-hda-codec-intelhdmi-objs := patch_intelhdmi.o hda_eld.o
+snd-hda-codec-intelhdmi-objs := patch_intelhdmi.o
 
 # common driver
 obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 3f51a981e604..29714c818b53 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -21,6 +21,7 @@
 
 #include <linux/input.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <sound/core.h>
 #include "hda_beep.h"
@@ -42,7 +43,7 @@ static void snd_hda_generate_beep(struct work_struct *work)
                 return;
 
         /* generate tone */
-        snd_hda_codec_write_cache(codec, beep->nid, 0,
+        snd_hda_codec_write(codec, beep->nid, 0,
                         AC_VERB_SET_BEEP_CONTROL, beep->tone);
 }
 
@@ -113,23 +114,25 @@ static int snd_hda_beep_event(struct input_dev *dev, unsigned int type,
         return 0;
 }
 
-int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
+static void snd_hda_do_detach(struct hda_beep *beep)
+{
+        input_unregister_device(beep->dev);
+        beep->dev = NULL;
+        cancel_work_sync(&beep->beep_work);
+        /* turn off beep for sure */
+        snd_hda_codec_write(beep->codec, beep->nid, 0,
+                                  AC_VERB_SET_BEEP_CONTROL, 0);
+}
+
+static int snd_hda_do_attach(struct hda_beep *beep)
 {
         struct input_dev *input_dev;
-        struct hda_beep *beep;
+        struct hda_codec *codec = beep->codec;
         int err;
 
-        if (!snd_hda_get_bool_hint(codec, "beep"))
-                return 0; /* disabled explicitly */
-
-        beep = kzalloc(sizeof(*beep), GFP_KERNEL);
-        if (beep == NULL)
-                return -ENOMEM;
-        snprintf(beep->phys, sizeof(beep->phys),
-                "card%d/codec#%d/beep0", codec->bus->card->number, codec->addr);
         input_dev = input_allocate_device();
         if (!input_dev) {
-                kfree(beep);
+                printk(KERN_INFO "hda_beep: unable to allocate input device\n");
                 return -ENOMEM;
         }
 
@@ -151,21 +154,100 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
         err = input_register_device(input_dev);
         if (err < 0) {
                 input_free_device(input_dev);
-                kfree(beep);
+                printk(KERN_INFO "hda_beep: unable to register input device\n");
                 return err;
         }
+        beep->dev = input_dev;
+        return 0;
+}
+
+static void snd_hda_do_register(struct work_struct *work)
+{
+        struct hda_beep *beep =
+                container_of(work, struct hda_beep, register_work);
+
+        mutex_lock(&beep->mutex);
+        if (beep->enabled && !beep->dev)
+                snd_hda_do_attach(beep);
+        mutex_unlock(&beep->mutex);
+}
+
+static void snd_hda_do_unregister(struct work_struct *work)
+{
+        struct hda_beep *beep =
+                container_of(work, struct hda_beep, unregister_work.work);
+
+        mutex_lock(&beep->mutex);
+        if (!beep->enabled && beep->dev)
+                snd_hda_do_detach(beep);
+        mutex_unlock(&beep->mutex);
+}
 
+int snd_hda_enable_beep_device(struct hda_codec *codec, int enable)
+{
+        struct hda_beep *beep = codec->beep;
+        enable = !!enable;
+        if (beep == NULL)
+                return 0;
+        if (beep->enabled != enable) {
+                beep->enabled = enable;
+                if (!enable) {
+                        /* turn off beep */
+                        snd_hda_codec_write(beep->codec, beep->nid, 0,
+                                                  AC_VERB_SET_BEEP_CONTROL, 0);
+                }
+                if (beep->mode == HDA_BEEP_MODE_SWREG) {
+                        if (enable) {
+                                cancel_delayed_work(&beep->unregister_work);
+                                schedule_work(&beep->register_work);
+                        } else {
+                                schedule_delayed_work(&beep->unregister_work,
+                                                                           HZ);
+                        }
+                }
+                return 1;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_HDA(snd_hda_enable_beep_device);
+
+int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
+{
+        struct hda_beep *beep;
+
+        if (!snd_hda_get_bool_hint(codec, "beep"))
+                return 0; /* disabled explicitly by hints */
+        if (codec->beep_mode == HDA_BEEP_MODE_OFF)
+                return 0; /* disabled by module option */
+
+        beep = kzalloc(sizeof(*beep), GFP_KERNEL);
+        if (beep == NULL)
+                return -ENOMEM;
+        snprintf(beep->phys, sizeof(beep->phys),
+                "card%d/codec#%d/beep0", codec->bus->card->number, codec->addr);
         /* enable linear scale */
         snd_hda_codec_write(codec, nid, 0,
                 AC_VERB_SET_DIGI_CONVERT_2, 0x01);
 
         beep->nid = nid;
-        beep->dev = input_dev;
         beep->codec = codec;
-        beep->enabled = 1;
+        beep->mode = codec->beep_mode;
         codec->beep = beep;
 
+        INIT_WORK(&beep->register_work, &snd_hda_do_register);
+        INIT_DELAYED_WORK(&beep->unregister_work, &snd_hda_do_unregister);
         INIT_WORK(&beep->beep_work, &snd_hda_generate_beep);
+        mutex_init(&beep->mutex);
+
+        if (beep->mode == HDA_BEEP_MODE_ON) {
+                int err = snd_hda_do_attach(beep);
+                if (err < 0) {
+                        kfree(beep);
+                        codec->beep = NULL;
+                        return err;
+                }
+        }
+
         return 0;
 }
 EXPORT_SYMBOL_HDA(snd_hda_attach_beep_device);
@@ -174,11 +256,12 @@ void snd_hda_detach_beep_device(struct hda_codec *codec)
 {
         struct hda_beep *beep = codec->beep;
         if (beep) {
-                cancel_work_sync(&beep->beep_work);
-
-                input_unregister_device(beep->dev);
-                kfree(beep);
+                cancel_work_sync(&beep->register_work);
+                cancel_delayed_work(&beep->unregister_work);
+                if (beep->dev)
+                        snd_hda_do_detach(beep);
                 codec->beep = NULL;
+                kfree(beep);
         }
 }
 EXPORT_SYMBOL_HDA(snd_hda_detach_beep_device);
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index 0c3de787c717..f1de1bac042c 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -24,19 +24,29 @@
 
 #include "hda_codec.h"
 
+#define HDA_BEEP_MODE_OFF       0
+#define HDA_BEEP_MODE_ON        1
+#define HDA_BEEP_MODE_SWREG     2
+
 /* beep information */
 struct hda_beep {
         struct input_dev *dev;
         struct hda_codec *codec;
+        unsigned int mode;
         char phys[32];
         int tone;
         hda_nid_t nid;
         unsigned int enabled:1;
+        unsigned int request_enable:1;
         unsigned int linear_tone:1;     /* linear tone for IDT/STAC codec */
+        struct work_struct register_work; /* registration work */
+        struct delayed_work unregister_work; /* unregistration work */
         struct work_struct beep_work; /* scheduled task for beep event */
+        struct mutex mutex;
 };
 
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
+int snd_hda_enable_beep_device(struct hda_codec *codec, int enable);
 int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);
 void snd_hda_detach_beep_device(struct hda_codec *codec);
 #else
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index af989f660cca..0e76ac2b2ace 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -30,6 +30,7 @@
 #include <sound/tlv.h>
 #include <sound/initval.h>
 #include "hda_local.h"
+#include "hda_beep.h"
 #include <sound/hda_hwdep.h>
 
 /*
@@ -93,6 +94,13 @@ static void hda_keep_power_on(struct hda_codec *codec);
 static inline void hda_keep_power_on(struct hda_codec *codec) {}
 #endif
 
+/**
+ * snd_hda_get_jack_location - Give a location string of the jack
+ * @cfg: pin default config value
+ *
+ * Parse the pin default config value and returns the string of the
+ * jack location, e.g. "Rear", "Front", etc.
+ */
 const char *snd_hda_get_jack_location(u32 cfg)
 {
         static char *bases[7] = {
@@ -120,6 +128,13 @@ const char *snd_hda_get_jack_location(u32 cfg)
 }
 EXPORT_SYMBOL_HDA(snd_hda_get_jack_location);
 
+/**
+ * snd_hda_get_jack_connectivity - Give a connectivity string of the jack
+ * @cfg: pin default config value
+ *
+ * Parse the pin default config value and returns the string of the
+ * jack connectivity, i.e. external or internal connection.
+ */
 const char *snd_hda_get_jack_connectivity(u32 cfg)
 {
         static char *jack_locations[4] = { "Ext", "Int", "Sep", "Oth" };
@@ -128,6 +143,13 @@ const char *snd_hda_get_jack_connectivity(u32 cfg)
 }
 EXPORT_SYMBOL_HDA(snd_hda_get_jack_connectivity);
 
+/**
+ * snd_hda_get_jack_type - Give a type string of the jack
+ * @cfg: pin default config value
+ *
+ * Parse the pin default config value and returns the string of the
+ * jack type, i.e. the purpose of the jack, such as Line-Out or CD.
+ */
 const char *snd_hda_get_jack_type(u32 cfg)
 {
         static char *jack_types[16] = {
@@ -515,6 +537,7 @@ static int snd_hda_bus_dev_register(struct snd_device *device)
         struct hda_codec *codec;
         list_for_each_entry(codec, &bus->codec_list, list) {
                 snd_hda_hwdep_add_sysfs(codec);
+                snd_hda_hwdep_add_power_sysfs(codec);
         }
         return 0;
 }
@@ -801,6 +824,9 @@ int snd_hda_add_pincfg(struct hda_codec *codec, struct snd_array *list,
         struct hda_pincfg *pin;
         unsigned int oldcfg;
 
+        if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN)
+                return -EINVAL;
+
         oldcfg = snd_hda_codec_get_pincfg(codec, nid);
         pin = look_up_pincfg(codec, list, nid);
         if (!pin) {
@@ -820,6 +846,16 @@ int snd_hda_add_pincfg(struct hda_codec *codec, struct snd_array *list,
         return 0;
 }
 
+/**
+ * snd_hda_codec_set_pincfg - Override a pin default configuration
+ * @codec: the HDA codec
+ * @nid: NID to set the pin config
+ * @cfg: the pin default config value
+ *
+ * Override a pin default configuration value in the cache.
+ * This value can be read by snd_hda_codec_get_pincfg() in a higher
+ * priority than the real hardware value.
+ */
 int snd_hda_codec_set_pincfg(struct hda_codec *codec,
                              hda_nid_t nid, unsigned int cfg)
 {
@@ -827,7 +863,15 @@ int snd_hda_codec_set_pincfg(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_codec_set_pincfg);
 
-/* get the current pin config value of the given pin NID */
+/**
+ * snd_hda_codec_get_pincfg - Obtain a pin-default configuration
+ * @codec: the HDA codec
+ * @nid: NID to get the pin config
+ *
+ * Get the current pin config value of the given pin NID.
+ * If the pincfg value is cached or overridden via sysfs or driver,
+ * returns the cached value.
+ */
 unsigned int snd_hda_codec_get_pincfg(struct hda_codec *codec, hda_nid_t nid)
 {
         struct hda_pincfg *pin;
@@ -858,6 +902,25 @@ static void restore_pincfgs(struct hda_codec *codec)
         }
 }
 
+/**
+ * snd_hda_shutup_pins - Shut up all pins
+ * @codec: the HDA codec
+ *
+ * Clear all pin controls to shup up before suspend for avoiding click noise.
+ * The controls aren't cached so that they can be resumed properly.
+ */
+void snd_hda_shutup_pins(struct hda_codec *codec)
+{
+        int i;
+        for (i = 0; i < codec->init_pins.used; i++) {
+                struct hda_pincfg *pin = snd_array_elem(&codec->init_pins, i);
+                /* use read here for syncing after issuing each verb */
+                snd_hda_codec_read(codec, pin->nid, 0,
+                                   AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
+        }
+}
+EXPORT_SYMBOL_HDA(snd_hda_shutup_pins);
+
 static void init_hda_cache(struct hda_cache_rec *cache,
                            unsigned int record_size);
 static void free_hda_cache(struct hda_cache_rec *cache);
@@ -890,6 +953,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
 #endif
         list_del(&codec->list);
         snd_array_free(&codec->mixers);
+        snd_array_free(&codec->nids);
         codec->bus->caddr_tbl[codec->addr] = NULL;
         if (codec->patch_ops.free)
                 codec->patch_ops.free(codec);
@@ -914,8 +978,9 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
  *
  * Returns 0 if successful, or a negative error code.
  */
-int /*__devinit*/ 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[31];
@@ -944,7 +1009,8 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr
         mutex_init(&codec->control_mutex);
         init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
         init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
-        snd_array_init(&codec->mixers, sizeof(struct snd_kcontrol *), 32);
+        snd_array_init(&codec->mixers, sizeof(struct hda_nid_item), 32);
+        snd_array_init(&codec->nids, sizeof(struct hda_nid_item), 32);
         snd_array_init(&codec->init_pins, sizeof(struct hda_pincfg), 16);
         snd_array_init(&codec->driver_pins, sizeof(struct hda_pincfg), 16);
         if (codec->bus->modelname) {
@@ -1026,6 +1092,15 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr
 }
 EXPORT_SYMBOL_HDA(snd_hda_codec_new);
 
+/**
+ * snd_hda_codec_configure - (Re-)configure the HD-audio codec
+ * @codec: the HDA codec
+ *
+ * Start parsing of the given codec tree and (re-)initialize the whole
+ * patch instance.
+ *
+ * Returns 0 if successful or a negative error code.
+ */
 int snd_hda_codec_configure(struct hda_codec *codec)
 {
         int err;
@@ -1036,11 +1111,6 @@ int snd_hda_codec_configure(struct hda_codec *codec)
                 if (err < 0)
                         return err;
         }
-        /* audio codec should override the mixer name */
-        if (codec->afg || !*codec->bus->card->mixername)
-                snprintf(codec->bus->card->mixername,
-                         sizeof(codec->bus->card->mixername),
-                         "%s %s", codec->vendor_name, codec->chip_name);
 
         if (is_generic_config(codec)) {
                 err = snd_hda_parse_generic_codec(codec);
@@ -1059,6 +1129,11 @@ int snd_hda_codec_configure(struct hda_codec *codec)
  patched:
         if (!err && codec->patch_ops.unsol_event)
                 err = init_unsol_queue(codec->bus);
+        /* audio codec should override the mixer name */
+        if (!err && (codec->afg || !*codec->bus->card->mixername))
+                snprintf(codec->bus->card->mixername,
+                         sizeof(codec->bus->card->mixername),
+                         "%s %s", codec->vendor_name, codec->chip_name);
         return err;
 }
 EXPORT_SYMBOL_HDA(snd_hda_codec_configure);
@@ -1088,6 +1163,11 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
 }
 EXPORT_SYMBOL_HDA(snd_hda_codec_setup_stream);
 
+/**
+ * snd_hda_codec_cleanup_stream - clean up the codec for closing
+ * @codec: the CODEC to clean up
+ * @nid: the NID to clean up
+ */
 void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid)
 {
         if (!nid)
@@ -1107,7 +1187,7 @@ EXPORT_SYMBOL_HDA(snd_hda_codec_cleanup_stream);
  */
 
 /* FIXME: more better hash key? */
-#define HDA_HASH_KEY(nid,dir,idx) (u32)((nid) + ((idx) << 16) + ((dir) << 24))
+#define HDA_HASH_KEY(nid, dir, idx) (u32)((nid) + ((idx) << 16) + ((dir) << 24))
 #define HDA_HASH_PINCAP_KEY(nid) (u32)((nid) + (0x02 << 24))
 #define HDA_HASH_PARPCM_KEY(nid) (u32)((nid) + (0x03 << 24))
 #define HDA_HASH_PARSTR_KEY(nid) (u32)((nid) + (0x04 << 24))
@@ -1163,8 +1243,17 @@ 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
+/**
+ * query_amp_caps - query AMP capabilities
+ * @codec: the HD-auio codec
+ * @nid: the NID to query
+ * @direction: either #HDA_INPUT or #HDA_OUTPUT
+ *
+ * Query AMP capabilities for the given widget and direction.
+ * Returns the obtained capability bits.
+ *
+ * When cap bits have been already read, this doesn't read again but
+ * returns the cached value.
  */
 u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)
 {
@@ -1187,6 +1276,19 @@ u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)
 }
 EXPORT_SYMBOL_HDA(query_amp_caps);
 
+/**
+ * snd_hda_override_amp_caps - Override the AMP capabilities
+ * @codec: the CODEC to clean up
+ * @nid: the NID to clean up
+ * @direction: either #HDA_INPUT or #HDA_OUTPUT
+ * @caps: the capability bits to set
+ *
+ * Override the cached AMP caps bits value by the given one.
+ * This function is useful if the driver needs to adjust the AMP ranges,
+ * e.g. limit to 0dB, etc.
+ *
+ * Returns zero if successful or a negative error code.
+ */
 int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,
                               unsigned int caps)
 {
@@ -1222,6 +1324,17 @@ static unsigned int read_pin_cap(struct hda_codec *codec, hda_nid_t nid)
         return snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
 }
 
+/**
+ * snd_hda_query_pin_caps - Query PIN capabilities
+ * @codec: the HD-auio codec
+ * @nid: the NID to query
+ *
+ * Query PIN capabilities for the given widget.
+ * Returns the obtained capability bits.
+ *
+ * When cap bits have been already read, this doesn't read again but
+ * returns the cached value.
+ */
 u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid)
 {
         return query_caps_hash(codec, nid, HDA_HASH_PINCAP_KEY(nid),
@@ -1229,6 +1342,43 @@ u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid)
 }
 EXPORT_SYMBOL_HDA(snd_hda_query_pin_caps);
 
+/**
+ * snd_hda_pin_sense - execute pin sense measurement
+ * @codec: the CODEC to sense
+ * @nid: the pin NID to sense
+ *
+ * Execute necessary pin sense measurement and return its Presence Detect,
+ * Impedance, ELD Valid etc. status bits.
+ */
+u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid)
+{
+        u32 pincap;
+
+        if (!codec->no_trigger_sense) {
+                pincap = snd_hda_query_pin_caps(codec, nid);
+                if (pincap & AC_PINCAP_TRIG_REQ) /* need trigger? */
+                        snd_hda_codec_read(codec, nid, 0,
+                                        AC_VERB_SET_PIN_SENSE, 0);
+        }
+        return snd_hda_codec_read(codec, nid, 0,
+                                  AC_VERB_GET_PIN_SENSE, 0);
+}
+EXPORT_SYMBOL_HDA(snd_hda_pin_sense);
+
+/**
+ * snd_hda_jack_detect - query pin Presence Detect status
+ * @codec: the CODEC to sense
+ * @nid: the pin NID to sense
+ *
+ * Query and return the pin's Presence Detect status.
+ */
+int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid)
+{
+        u32 sense = snd_hda_pin_sense(codec, nid);
+        return !!(sense & AC_PINSENSE_PRESENCE);
+}
+EXPORT_SYMBOL_HDA(snd_hda_jack_detect);
+
 /*
  * read the current volume to info
  * if the cache exists, read the cache value.
@@ -1269,8 +1419,15 @@ static void put_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,
         info->vol[ch] = val;
 }
 
-/*
- * read AMP value.  The volume is between 0 to 0x7f, 0x80 = mute bit.
+/**
+ * snd_hda_codec_amp_read - Read AMP value
+ * @codec: HD-audio codec
+ * @nid: NID to read the AMP value
+ * @ch: channel (left=0 or right=1)
+ * @direction: #HDA_INPUT or #HDA_OUTPUT
+ * @index: the index value (only for input direction)
+ *
+ * Read AMP value.  The volume is between 0 to 0x7f, 0x80 = mute bit.
  */
 int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch,
                            int direction, int index)
@@ -1283,8 +1440,18 @@ int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch,
 }
 EXPORT_SYMBOL_HDA(snd_hda_codec_amp_read);
 
-/*
- * update the AMP value, mask = bit mask to set, val = the value
+/**
+ * snd_hda_codec_amp_update - update the AMP value
+ * @codec: HD-audio codec
+ * @nid: NID to read the AMP value
+ * @ch: channel (left=0 or right=1)
+ * @direction: #HDA_INPUT or #HDA_OUTPUT
+ * @idx: the index value (only for input direction)
+ * @mask: bit mask to set
+ * @val: the bits value to set
+ *
+ * Update the AMP value with a bit mask.
+ * Returns 0 if the value is unchanged, 1 if changed.
  */
 int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
                              int direction, int idx, int mask, int val)
@@ -1303,8 +1470,17 @@ int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
 }
 EXPORT_SYMBOL_HDA(snd_hda_codec_amp_update);
 
-/*
- * update the AMP stereo with the same mask and value
+/**
+ * snd_hda_codec_amp_stereo - update the AMP stereo values
+ * @codec: HD-audio codec
+ * @nid: NID to read the AMP value
+ * @direction: #HDA_INPUT or #HDA_OUTPUT
+ * @idx: the index value (only for input direction)
+ * @mask: bit mask to set
+ * @val: the bits value to set
+ *
+ * Update the AMP values like snd_hda_codec_amp_update(), but for a
+ * stereo widget 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)
@@ -1318,7 +1494,12 @@ int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid,
 EXPORT_SYMBOL_HDA(snd_hda_codec_amp_stereo);
 
 #ifdef SND_HDA_NEEDS_RESUME
-/* resume the all amp commands from the cache */
+/**
+ * snd_hda_codec_resume_amp - Resume all AMP commands from the cache
+ * @codec: HD-audio codec
+ *
+ * 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.buf.list;
@@ -1344,7 +1525,12 @@ void snd_hda_codec_resume_amp(struct hda_codec *codec)
 EXPORT_SYMBOL_HDA(snd_hda_codec_resume_amp);
 #endif /* SND_HDA_NEEDS_RESUME */
 
-/* volume */
+/**
+ * snd_hda_mixer_amp_volume_info - Info callback for a standard AMP mixer
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.
+ */
 int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_info *uinfo)
 {
@@ -1400,6 +1586,12 @@ update_amp_value(struct hda_codec *codec, hda_nid_t nid,
                                         HDA_AMP_VOLMASK, val);
 }
 
+/**
+ * snd_hda_mixer_amp_volume_get - Get callback for a standard AMP mixer volume
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.
+ */
 int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
@@ -1419,6 +1611,12 @@ int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_get);
 
+/**
+ * snd_hda_mixer_amp_volume_put - Put callback for a standard AMP mixer volume
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.
+ */
 int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
@@ -1443,6 +1641,12 @@ int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_put);
 
+/**
+ * snd_hda_mixer_amp_volume_put - TLV callback for a standard AMP mixer volume
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.
+ */
 int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
                           unsigned int size, unsigned int __user *_tlv)
 {
@@ -1472,8 +1676,16 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_tlv);
 
-/*
- * set (static) TLV for virtual master volume; recalculated as max 0dB
+/**
+ * snd_hda_set_vmaster_tlv - Set TLV for a virtual master control
+ * @codec: HD-audio codec
+ * @nid: NID of a reference widget
+ * @dir: #HDA_INPUT or #HDA_OUTPUT
+ * @tlv: TLV data to be stored, at least 4 elements
+ *
+ * Set (static) TLV data for a virtual master volume using the AMP caps
+ * obtained from the reference NID.
+ * The volume range is recalculated as if the max volume is 0dB.
  */
 void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir,
                              unsigned int *tlv)
@@ -1507,6 +1719,13 @@ _snd_hda_find_mixer_ctl(struct hda_codec *codec,
         return snd_ctl_find_id(codec->bus->card, &id);
 }
 
+/**
+ * snd_hda_find_mixer_ctl - Find a mixer control element with the given name
+ * @codec: HD-audio codec
+ * @name: ctl id name string
+ *
+ * Get the control element with the given id string and IFACE_MIXER.
+ */
 struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
                                             const char *name)
 {
@@ -1514,31 +1733,97 @@ struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_find_mixer_ctl);
 
-/* Add a control element and assign to the codec */
-int snd_hda_ctl_add(struct hda_codec *codec, struct snd_kcontrol *kctl)
+/**
+ * snd_hda_ctl_add - Add a control element and assign to the codec
+ * @codec: HD-audio codec
+ * @nid: corresponding NID (optional)
+ * @kctl: the control element to assign
+ *
+ * Add the given control element to an array inside the codec instance.
+ * All control elements belonging to a codec are supposed to be added
+ * by this function so that a proper clean-up works at the free or
+ * reconfiguration time.
+ *
+ * If non-zero @nid is passed, the NID is assigned to the control element.
+ * The assignment is shown in the codec proc file.
+ *
+ * snd_hda_ctl_add() checks the control subdev id field whether
+ * #HDA_SUBDEV_NID_FLAG bit is set.  If set (and @nid is zero), the lower
+ * bits value is taken as the NID to assign. The #HDA_NID_ITEM_AMP bit
+ * specifies if kctl->private_value is a HDA amplifier value.
+ */
+int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid,
+                    struct snd_kcontrol *kctl)
 {
         int err;
-        struct snd_kcontrol **knewp;
+        unsigned short flags = 0;
+        struct hda_nid_item *item;
 
+        if (kctl->id.subdevice & HDA_SUBDEV_AMP_FLAG) {
+                flags |= HDA_NID_ITEM_AMP;
+                if (nid == 0)
+                        nid = get_amp_nid_(kctl->private_value);
+        }
+        if ((kctl->id.subdevice & HDA_SUBDEV_NID_FLAG) != 0 && nid == 0)
+                nid = kctl->id.subdevice & 0xffff;
+        if (kctl->id.subdevice & (HDA_SUBDEV_NID_FLAG|HDA_SUBDEV_AMP_FLAG))
+                kctl->id.subdevice = 0;
         err = snd_ctl_add(codec->bus->card, kctl);
         if (err < 0)
                 return err;
-        knewp = snd_array_new(&codec->mixers);
-        if (!knewp)
+        item = snd_array_new(&codec->mixers);
+        if (!item)
                 return -ENOMEM;
-        *knewp = kctl;
+        item->kctl = kctl;
+        item->nid = nid;
+        item->flags = flags;
         return 0;
 }
 EXPORT_SYMBOL_HDA(snd_hda_ctl_add);
 
-/* Clear all controls assigned to the given codec */
+/**
+ * snd_hda_add_nid - Assign a NID to a control element
+ * @codec: HD-audio codec
+ * @nid: corresponding NID (optional)
+ * @kctl: the control element to assign
+ * @index: index to kctl
+ *
+ * Add the given control element to an array inside the codec instance.
+ * This function is used when #snd_hda_ctl_add cannot be used for 1:1
+ * NID:KCTL mapping - for example "Capture Source" selector.
+ */
+int snd_hda_add_nid(struct hda_codec *codec, struct snd_kcontrol *kctl,
+                    unsigned int index, hda_nid_t nid)
+{
+        struct hda_nid_item *item;
+
+        if (nid > 0) {
+                item = snd_array_new(&codec->nids);
+                if (!item)
+                        return -ENOMEM;
+                item->kctl = kctl;
+                item->index = index;
+                item->nid = nid;
+                return 0;
+        }
+        printk(KERN_ERR "hda-codec: no NID for mapping control %s:%d:%d\n",
+               kctl->id.name, kctl->id.index, index);
+        return -EINVAL;
+}
+EXPORT_SYMBOL_HDA(snd_hda_add_nid);
+
+/**
+ * snd_hda_ctls_clear - Clear all controls assigned to the given codec
+ * @codec: HD-audio codec
+ */
 void snd_hda_ctls_clear(struct hda_codec *codec)
 {
         int i;
-        struct snd_kcontrol **kctls = codec->mixers.list;
+        struct hda_nid_item *items = codec->mixers.list;
         for (i = 0; i < codec->mixers.used; i++)
-                snd_ctl_remove(codec->bus->card, kctls[i]);
+                snd_ctl_remove(codec->bus->card, items[i].kctl);
         snd_array_free(&codec->mixers);
+        snd_array_free(&codec->nids);
 }
 
 /* pseudo device locking
@@ -1563,6 +1848,16 @@ static void hda_unlock_devices(struct snd_card *card)
         spin_unlock(&card->files_lock);
 }
 
+/**
+ * snd_hda_codec_reset - Clear all objects assigned to the codec
+ * @codec: HD-audio codec
+ *
+ * This frees the all PCM and control elements assigned to the codec, and
+ * clears the caches and restores the pin default configurations.
+ *
+ * When a device is being used, it returns -EBSY.  If successfully freed,
+ * returns zero.
+ */
 int snd_hda_codec_reset(struct hda_codec *codec)
 {
         struct snd_card *card = codec->bus->card;
@@ -1626,7 +1921,22 @@ int snd_hda_codec_reset(struct hda_codec *codec)
         return 0;
 }
 
-/* create a virtual master control and add slaves */
+/**
+ * snd_hda_add_vmaster - create a virtual master control and add slaves
+ * @codec: HD-audio codec
+ * @name: vmaster control name
+ * @tlv: TLV data (optional)
+ * @slaves: slave control names (optional)
+ *
+ * Create a virtual master control with the given name.  The TLV data
+ * must be either NULL or a valid data.
+ *
+ * @slaves is a NULL-terminated array of strings, each of which is a
+ * slave control name.  All controls with these names are assigned to
+ * the new virtual master control.
+ *
+ * This function returns zero if successful or a negative error code.
+ */
 int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
                         unsigned int *tlv, const char **slaves)
 {
@@ -1643,10 +1953,10 @@ int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
         kctl = snd_ctl_make_virtual_master(name, tlv);
         if (!kctl)
                 return -ENOMEM;
-        err = snd_hda_ctl_add(codec, kctl);
+        err = snd_hda_ctl_add(codec, 0, kctl);
         if (err < 0)
                 return err;
-        
+
         for (s = slaves; *s; s++) {
                 struct snd_kcontrol *sctl;
                 int i = 0;
@@ -1668,7 +1978,12 @@ int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
 }
 EXPORT_SYMBOL_HDA(snd_hda_add_vmaster);
 
-/* switch */
+/**
+ * snd_hda_mixer_amp_switch_info - Info callback for a standard AMP mixer switch
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.
+ */
 int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_info *uinfo)
 {
@@ -1682,6 +1997,12 @@ int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_info);
 
+/**
+ * snd_hda_mixer_amp_switch_get - Get callback for a standard AMP mixer switch
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.
+ */
 int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
@@ -1702,6 +2023,12 @@ int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_get);
 
+/**
+ * snd_hda_mixer_amp_switch_put - Put callback for a standard AMP mixer switch
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.
+ */
 int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
@@ -1733,6 +2060,25 @@ int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put);
 
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
+/**
+ * snd_hda_mixer_amp_switch_put_beep - Put callback for a beep AMP switch
+ *
+ * This function calls snd_hda_enable_beep_device(), which behaves differently
+ * depending on beep_mode option.
+ */
+int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        long *valp = ucontrol->value.integer.value;
+
+        snd_hda_enable_beep_device(codec, *valp);
+        return snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
+}
+EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put_beep);
+#endif /* CONFIG_SND_HDA_INPUT_BEEP */
+
 /*
  * bound volume controls
  *
@@ -1742,6 +2088,12 @@ EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put);
 #define AMP_VAL_IDX_SHIFT       19
 #define AMP_VAL_IDX_MASK        (0x0f<<19)
 
+/**
+ * snd_hda_mixer_bind_switch_get - Get callback for a bound volume control
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_BIND_MUTE*() macros.
+ */
 int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
@@ -1759,6 +2111,12 @@ int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_get);
 
+/**
+ * snd_hda_mixer_bind_switch_put - Put callback for a bound volume control
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_BIND_MUTE*() macros.
+ */
 int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
@@ -1783,8 +2141,11 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_put);
 
-/*
- * generic bound volume/swtich controls
+/**
+ * snd_hda_mixer_bind_ctls_info - Info callback for a generic bound control
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_BIND_VOL() or HDA_BIND_SW() macros.
  */
 int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_info *uinfo)
@@ -1803,6 +2164,12 @@ int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_info);
 
+/**
+ * snd_hda_mixer_bind_ctls_get - Get callback for a generic bound control
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_BIND_VOL() or HDA_BIND_SW() macros.
+ */
 int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
@@ -1820,6 +2187,12 @@ int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_get);
 
+/**
+ * snd_hda_mixer_bind_ctls_put - Put callback for a generic bound control
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_BIND_VOL() or HDA_BIND_SW() macros.
+ */
 int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
@@ -1843,6 +2216,12 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_put);
 
+/**
+ * snd_hda_mixer_bind_tlv - TLV callback for a generic bound control
+ *
+ * The control element is supposed to have the private_value field
+ * set up via HDA_BIND_VOL() macro.
+ */
 int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag,
                            unsigned int size, unsigned int __user *tlv)
 {
@@ -2064,27 +2443,27 @@ static struct snd_kcontrol_new dig_mixes[] = {
         {
                 .access = SNDRV_CTL_ELEM_ACCESS_READ,
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+                .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, CON_MASK),
                 .info = snd_hda_spdif_mask_info,
                 .get = snd_hda_spdif_cmask_get,
         },
         {
                 .access = SNDRV_CTL_ELEM_ACCESS_READ,
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
+                .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, PRO_MASK),
                 .info = snd_hda_spdif_mask_info,
                 .get = snd_hda_spdif_pmask_get,
         },
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+                .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
                 .info = snd_hda_spdif_mask_info,
                 .get = snd_hda_spdif_default_get,
                 .put = snd_hda_spdif_default_put,
         },
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH),
+                .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, SWITCH),
                 .info = snd_hda_spdif_out_switch_info,
                 .get = snd_hda_spdif_out_switch_get,
                 .put = snd_hda_spdif_out_switch_put,
@@ -2126,7 +2505,7 @@ int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid)
                         return -ENOMEM;
                 kctl->id.index = idx;
                 kctl->private_value = nid;
-                err = snd_hda_ctl_add(codec, kctl);
+                err = snd_hda_ctl_add(codec, nid, kctl);
                 if (err < 0)
                         return err;
         }
@@ -2165,14 +2544,19 @@ static struct snd_kcontrol_new spdif_share_sw = {
         .put = spdif_share_sw_put,
 };
 
+/**
+ * snd_hda_create_spdif_share_sw - create Default PCM switch
+ * @codec: the HDA codec
+ * @mout: multi-out instance
+ */
 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_hda_ctl_add(codec,
-                           snd_ctl_new1(&spdif_share_sw, mout));
+        return snd_hda_ctl_add(codec, mout->dig_out_nid,
+                              snd_ctl_new1(&spdif_share_sw, mout));
 }
 EXPORT_SYMBOL_HDA(snd_hda_create_spdif_share_sw);
 
@@ -2230,7 +2614,7 @@ static int snd_hda_spdif_in_status_get(struct snd_kcontrol *kcontrol,
 static struct snd_kcontrol_new dig_in_ctls[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH),
+                .name = SNDRV_CTL_NAME_IEC958("", CAPTURE, SWITCH),
                 .info = snd_hda_spdif_in_switch_info,
                 .get = snd_hda_spdif_in_switch_get,
                 .put = snd_hda_spdif_in_switch_put,
@@ -2238,7 +2622,7 @@ static struct snd_kcontrol_new dig_in_ctls[] = {
         {
                 .access = SNDRV_CTL_ELEM_ACCESS_READ,
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,DEFAULT),
+                .name = SNDRV_CTL_NAME_IEC958("", CAPTURE, DEFAULT),
                 .info = snd_hda_spdif_mask_info,
                 .get = snd_hda_spdif_in_status_get,
         },
@@ -2276,7 +2660,7 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
                 if (!kctl)
                         return -ENOMEM;
                 kctl->private_value = nid;
-                err = snd_hda_ctl_add(codec, kctl);
+                err = snd_hda_ctl_add(codec, nid, kctl);
                 if (err < 0)
                         return err;
         }
@@ -2332,7 +2716,12 @@ int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid,
 }
 EXPORT_SYMBOL_HDA(snd_hda_codec_write_cache);
 
-/* resume the all commands from the cache */
+/**
+ * snd_hda_codec_resume_cache - Resume the all commands from the cache
+ * @codec: HD-audio codec
+ *
+ * Execute all verbs recorded in the command caches to resume.
+ */
 void snd_hda_codec_resume_cache(struct hda_codec *codec)
 {
         struct hda_cache_head *buffer = codec->cmd_cache.buf.list;
@@ -2382,7 +2771,8 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
         snd_hda_codec_read(codec, fg, 0, AC_VERB_SET_POWER_STATE,
                             power_state);
         /* partial workaround for "azx_get_response timeout" */
-        if (power_state == AC_PWRST_D0)
+        if (power_state == AC_PWRST_D0 &&
+            (codec->vendor_id & 0xffff0000) == 0x14f10000)
                 msleep(10);
 
         nid = codec->start_nid;
@@ -2416,7 +2806,6 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
         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 {
@@ -2452,9 +2841,11 @@ static void hda_call_codec_suspend(struct hda_codec *codec)
                             codec->afg ? codec->afg : codec->mfg,
                             AC_PWRST_D3);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
+        snd_hda_update_power_acct(codec);
         cancel_delayed_work(&codec->power_work);
         codec->power_on = 0;
         codec->power_transition = 0;
+        codec->power_jiffies = jiffies;
 #endif
 }
 
@@ -2495,8 +2886,8 @@ int /*__devinit*/ snd_hda_build_controls(struct hda_bus *bus)
         list_for_each_entry(codec, &bus->codec_list, list) {
                 int err = snd_hda_codec_build_controls(codec);
                 if (err < 0) {
-                        printk(KERN_ERR "hda_codec: cannot build controls"
-                               "for #%d (error %d)\n", codec->addr, err); 
+                        printk(KERN_ERR "hda_codec: cannot build controls "
+                               "for #%d (error %d)\n", codec->addr, err);
                         err = snd_hda_codec_reset(codec);
                         if (err < 0) {
                                 printk(KERN_ERR
@@ -2592,8 +2983,12 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate,
         val |= channels - 1;
 
         switch (snd_pcm_format_width(format)) {
-        case 8:  val |= 0x00; break;
-        case 16: val |= 0x10; break;
+        case 8:
+                val |= 0x00;
+                break;
+        case 16:
+                val |= 0x10;
+                break;
         case 20:
         case 24:
         case 32:
@@ -2756,8 +3151,12 @@ static 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 the validity of the format
+ * @codec: HD-audio codec
+ * @nid: NID to check
+ * @format: the HD-audio format value to check
+ *
+ * Check whether the given node supports the format value.
  *
  * Returns 1 if supported, 0 if not.
  */
@@ -2877,51 +3276,39 @@ static int set_pcm_default_values(struct hda_codec *codec,
         return 0;
 }
 
+/* global */
+const char *snd_hda_pcm_type_name[HDA_PCM_NTYPES] = {
+        "Audio", "SPDIF", "HDMI", "Modem"
+};
+
 /*
  * get the empty PCM device number to assign
+ *
+ * note the max device number is limited by HDA_MAX_PCMS, currently 10
  */
 static int get_empty_pcm_device(struct hda_bus *bus, int type)
 {
-        static const char *dev_name[HDA_PCM_NTYPES] = {
-                "Audio", "SPDIF", "HDMI", "Modem"
+        /* audio device indices; not linear to keep compatibility */
+        static int audio_idx[HDA_PCM_NTYPES][5] = {
+                [HDA_PCM_TYPE_AUDIO] = { 0, 2, 4, 5, -1 },
+                [HDA_PCM_TYPE_SPDIF] = { 1, -1 },
+                [HDA_PCM_TYPE_HDMI]  = { 3, 7, 8, 9, -1 },
+                [HDA_PCM_TYPE_MODEM] = { 6, -1 },
         };
-        /* 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 };
-        int i, dev;
-
-        switch (type) {
-        case HDA_PCM_TYPE_AUDIO:
-                for (i = 0; i < ARRAY_SIZE(audio_idx); i++) {
-                        dev = audio_idx[i];
-                        if (!test_bit(dev, bus->pcm_dev_bits))
-                                goto ok;
-                }
-                snd_printk(KERN_WARNING "Too many audio devices\n");
-                return -EAGAIN;
-        case HDA_PCM_TYPE_SPDIF:
-        case HDA_PCM_TYPE_HDMI:
-        case HDA_PCM_TYPE_MODEM:
-                dev = dev_idx[type];
-                if (test_bit(dev, bus->pcm_dev_bits)) {
-                        snd_printk(KERN_WARNING "%s already defined\n",
-                                   dev_name[type]);
-                        return -EAGAIN;
-                }
-                break;
-        default:
+        int i;
+
+        if (type >= HDA_PCM_NTYPES) {
                 snd_printk(KERN_WARNING "Invalid PCM type %d\n", type);
                 return -EINVAL;
         }
- ok:
-        set_bit(dev, bus->pcm_dev_bits);
-        return dev;
+
+        for (i = 0; audio_idx[type][i] >= 0 ; i++)
+                if (!test_and_set_bit(audio_idx[type][i], bus->pcm_dev_bits))
+                        return audio_idx[type][i];
+
+        snd_printk(KERN_WARNING "Too many %s devices\n",
+                snd_hda_pcm_type_name[type]);
+        return -EAGAIN;
 }
 
 /*
@@ -2958,7 +3345,7 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec)
                 err = codec->patch_ops.build_pcms(codec);
                 if (err < 0) {
                         printk(KERN_ERR "hda_codec: cannot build PCMs"
-                               "for #%d (error %d)\n", codec->addr, err); 
+                               "for #%d (error %d)\n", codec->addr, err);
                         err = snd_hda_codec_reset(codec);
                         if (err < 0) {
                                 printk(KERN_ERR
@@ -3088,8 +3475,8 @@ EXPORT_SYMBOL_HDA(snd_hda_check_board_config);
 
 /**
  * snd_hda_check_board_codec_sid_config - compare the current codec
-                                          subsystem ID with the
-                                          config table
+                                        subsystem ID with the
+                                        config table
 
            This is important for Gateway notebooks with SB450 HDA Audio
            where the vendor ID of the PCI device is:
@@ -3159,14 +3546,16 @@ EXPORT_SYMBOL_HDA(snd_hda_check_board_codec_sid_config);
  */
 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;
+                if (knew->iface == -1)  /* skip this codec private value */
+                        continue;
                 kctl = snd_ctl_new1(knew, codec);
                 if (!kctl)
                         return -ENOMEM;
-                err = snd_hda_ctl_add(codec, kctl);
+                err = snd_hda_ctl_add(codec, 0, kctl);
                 if (err < 0) {
                         if (!codec->addr)
                                 return err;
@@ -3174,7 +3563,7 @@ int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)
                         if (!kctl)
                                 return -ENOMEM;
                         kctl->id.device = codec->addr;
-                        err = snd_hda_ctl_add(codec, kctl);
+                        err = snd_hda_ctl_add(codec, 0, kctl);
                         if (err < 0)
                                 return err;
                 }
@@ -3207,8 +3596,27 @@ static void hda_keep_power_on(struct hda_codec *codec)
 {
         codec->power_count++;
         codec->power_on = 1;
+        codec->power_jiffies = jiffies;
+}
+
+/* update the power on/off account with the current jiffies */
+void snd_hda_update_power_acct(struct hda_codec *codec)
+{
+        unsigned long delta = jiffies - codec->power_jiffies;
+        if (codec->power_on)
+                codec->power_on_acct += delta;
+        else
+                codec->power_off_acct += delta;
+        codec->power_jiffies += delta;
 }
 
+/**
+ * snd_hda_power_up - Power-up the codec
+ * @codec: HD-audio codec
+ *
+ * Increment the power-up counter and power up the hardware really when
+ * not turned on yet.
+ */
 void snd_hda_power_up(struct hda_codec *codec)
 {
         struct hda_bus *bus = codec->bus;
@@ -3217,7 +3625,9 @@ void snd_hda_power_up(struct hda_codec *codec)
         if (codec->power_on || codec->power_transition)
                 return;
 
+        snd_hda_update_power_acct(codec);
         codec->power_on = 1;
+        codec->power_jiffies = jiffies;
         if (bus->ops.pm_notify)
                 bus->ops.pm_notify(bus);
         hda_call_codec_resume(codec);
@@ -3229,9 +3639,13 @@ EXPORT_SYMBOL_HDA(snd_hda_power_up);
 #define power_save(codec)       \
         ((codec)->bus->power_save ? *(codec)->bus->power_save : 0)
 
-#define power_save(codec)       \
-        ((codec)->bus->power_save ? *(codec)->bus->power_save : 0)
-
+/**
+ * snd_hda_power_down - Power-down the codec
+ * @codec: HD-audio codec
+ *
+ * Decrement the power-up counter and schedules the power-off work if
+ * the counter rearches to zero.
+ */
 void snd_hda_power_down(struct hda_codec *codec)
 {
         --codec->power_count;
@@ -3245,6 +3659,19 @@ void snd_hda_power_down(struct hda_codec *codec)
 }
 EXPORT_SYMBOL_HDA(snd_hda_power_down);
 
+/**
+ * snd_hda_check_amp_list_power - Check the amp list and update the power
+ * @codec: HD-audio codec
+ * @check: the object containing an AMP list and the status
+ * @nid: NID to check / update
+ *
+ * Check whether the given NID is in the amp list.  If it's in the list,
+ * check the current AMP status, and update the the power-status according
+ * to the mute status.
+ *
+ * This function is supposed to be set or called from the check_power_status
+ * patch ops.
+ */
 int snd_hda_check_amp_list_power(struct hda_codec *codec,
                                  struct hda_loopback_check *check,
                                  hda_nid_t nid)
@@ -3286,6 +3713,10 @@ EXPORT_SYMBOL_HDA(snd_hda_check_amp_list_power);
 /*
  * Channel mode helper
  */
+
+/**
+ * snd_hda_ch_mode_info - Info callback helper for the channel mode enum
+ */
 int snd_hda_ch_mode_info(struct hda_codec *codec,
                          struct snd_ctl_elem_info *uinfo,
                          const struct hda_channel_mode *chmode,
@@ -3302,6 +3733,9 @@ int snd_hda_ch_mode_info(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_ch_mode_info);
 
+/**
+ * snd_hda_ch_mode_get - Get callback helper for the channel mode enum
+ */
 int snd_hda_ch_mode_get(struct hda_codec *codec,
                         struct snd_ctl_elem_value *ucontrol,
                         const struct hda_channel_mode *chmode,
@@ -3320,6 +3754,9 @@ int snd_hda_ch_mode_get(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_ch_mode_get);
 
+/**
+ * snd_hda_ch_mode_put - Put callback helper for the channel mode enum
+ */
 int snd_hda_ch_mode_put(struct hda_codec *codec,
                         struct snd_ctl_elem_value *ucontrol,
                         const struct hda_channel_mode *chmode,
@@ -3344,6 +3781,10 @@ EXPORT_SYMBOL_HDA(snd_hda_ch_mode_put);
 /*
  * input MUX helper
  */
+
+/**
+ * snd_hda_input_mux_info_info - Info callback helper for the input-mux enum
+ */
 int snd_hda_input_mux_info(const struct hda_input_mux *imux,
                            struct snd_ctl_elem_info *uinfo)
 {
@@ -3362,6 +3803,9 @@ int snd_hda_input_mux_info(const struct hda_input_mux *imux,
 }
 EXPORT_SYMBOL_HDA(snd_hda_input_mux_info);
 
+/**
+ * snd_hda_input_mux_info_put - Put callback helper for the input-mux enum
+ */
 int snd_hda_input_mux_put(struct hda_codec *codec,
                           const struct hda_input_mux *imux,
                           struct snd_ctl_elem_value *ucontrol,
@@ -3395,7 +3839,7 @@ static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid,
 {
         /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */
         if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE))
-                set_dig_out_convert(codec, nid, 
+                set_dig_out_convert(codec, nid,
                                     codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff,
                                     -1);
         snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format);
@@ -3421,8 +3865,29 @@ static void cleanup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid)
         }
 }
 
-/*
- * open the digital out in the exclusive mode
+/**
+ * snd_hda_bus_reboot_notify - call the reboot notifier of each codec
+ * @bus: HD-audio bus
+ */
+void snd_hda_bus_reboot_notify(struct hda_bus *bus)
+{
+        struct hda_codec *codec;
+
+        if (!bus)
+                return;
+        list_for_each_entry(codec, &bus->codec_list, list) {
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+                if (!codec->power_on)
+                        continue;
+#endif
+                if (codec->patch_ops.reboot_notify)
+                        codec->patch_ops.reboot_notify(codec);
+        }
+}
+EXPORT_SYMBOL_HDA(snd_hda_bus_reboot_notify);
+
+/**
+ * snd_hda_multi_out_dig_open - open the digital out in the exclusive mode
  */
 int snd_hda_multi_out_dig_open(struct hda_codec *codec,
                                struct hda_multi_out *mout)
@@ -3437,6 +3902,9 @@ int snd_hda_multi_out_dig_open(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_open);
 
+/**
+ * snd_hda_multi_out_dig_prepare - prepare the digital out stream
+ */
 int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
                                   struct hda_multi_out *mout,
                                   unsigned int stream_tag,
@@ -3450,6 +3918,9 @@ int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_prepare);
 
+/**
+ * snd_hda_multi_out_dig_cleanup - clean-up the digital out stream
+ */
 int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec,
                                   struct hda_multi_out *mout)
 {
@@ -3460,8 +3931,8 @@ int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_cleanup);
 
-/*
- * release the digital out
+/**
+ * snd_hda_multi_out_dig_close - release the digital out stream
  */
 int snd_hda_multi_out_dig_close(struct hda_codec *codec,
                                 struct hda_multi_out *mout)
@@ -3473,8 +3944,12 @@ int snd_hda_multi_out_dig_close(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_close);
 
-/*
- * set up more restrictions for analog out
+/**
+ * snd_hda_multi_out_analog_open - open analog outputs
+ *
+ * Open analog outputs and set up the hw-constraints.
+ * If the digital outputs can be opened as slave, open the digital
+ * outputs, too.
  */
 int snd_hda_multi_out_analog_open(struct hda_codec *codec,
                                   struct hda_multi_out *mout,
@@ -3519,9 +3994,11 @@ int snd_hda_multi_out_analog_open(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_open);
 
-/*
- * set up the i/o for analog out
- * when the digital out is available, copy the front out to digital out, too.
+/**
+ * snd_hda_multi_out_analog_prepare - Preapre the analog outputs.
+ *
+ * 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,
@@ -3578,8 +4055,8 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_prepare);
 
-/*
- * clean up the setting for analog out
+/**
+ * snd_hda_multi_out_analog_cleanup - clean up the setting for analog out
  */
 int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
                                      struct hda_multi_out *mout)
@@ -3621,13 +4098,13 @@ static int is_in_nid_list(hda_nid_t nid, hda_nid_t *list)
 /*
  * Sort an associated group of pins according to their sequence numbers.
  */
-static void sort_pins_by_sequence(hda_nid_t * pins, short * sequences,
+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]) {
@@ -3655,7 +4132,7 @@ static void sort_pins_by_sequence(hda_nid_t * pins, short * sequences,
  * is detected, one of speaker of HP pins is assigned as the primary
  * output, i.e. to line_out_pins[0].  So, line_outs is always positive
  * if any analog output exists.
- * 
+ *
  * The analog input pins are assigned to input_pins array.
  * The digital input/output pins are assigned to dig_in_pin and dig_out_pin,
  * respectively.
@@ -3718,9 +4195,9 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                 case AC_JACK_SPEAKER:
                         seq = get_defcfg_sequence(def_conf);
                         assoc = get_defcfg_association(def_conf);
-                        if (! assoc)
+                        if (!assoc)
                                 continue;
-                        if (! assoc_speaker)
+                        if (!assoc_speaker)
                                 assoc_speaker = assoc;
                         else if (assoc_speaker != assoc)
                                 continue;
@@ -3818,7 +4295,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                               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]) {
@@ -3965,8 +4442,14 @@ EXPORT_SYMBOL_HDA(snd_hda_resume);
  * generic arrays
  */
 
-/* get a new element from the given array
- * if it exceeds the pre-allocated array size, re-allocate the array
+/**
+ * snd_array_new - get a new element from the given array
+ * @array: the array object
+ *
+ * Get a new element from the given array.  If it exceeds the
+ * pre-allocated array size, re-allocate the array.
+ *
+ * Returns NULL if allocation failed.
  */
 void *snd_array_new(struct snd_array *array)
 {
@@ -3990,7 +4473,10 @@ void *snd_array_new(struct snd_array *array)
 }
 EXPORT_SYMBOL_HDA(snd_array_new);
 
-/* free the given array elements */
+/**
+ * snd_array_free - free the given array elements
+ * @array: the array object
+ */
 void snd_array_free(struct snd_array *array)
 {
         kfree(array->list);
@@ -4000,7 +4486,12 @@ void snd_array_free(struct snd_array *array)
 }
 EXPORT_SYMBOL_HDA(snd_array_free);
 
-/*
+/**
+ * snd_print_pcm_rates - Print the supported PCM rates to the string buffer
+ * @pcm: PCM caps bits
+ * @buf: the string buffer to write
+ * @buflen: the max buffer length
+ *
  * used by hda_proc.c and hda_eld.c
  */
 void snd_print_pcm_rates(int pcm, char *buf, int buflen)
@@ -4019,6 +4510,14 @@ void snd_print_pcm_rates(int pcm, char *buf, int buflen)
 }
 EXPORT_SYMBOL_HDA(snd_print_pcm_rates);
 
+/**
+ * snd_print_pcm_bits - Print the supported PCM fmt bits to the string buffer
+ * @pcm: PCM caps bits
+ * @buf: the string buffer to write
+ * @buflen: the max buffer length
+ *
+ * used by hda_proc.c and hda_eld.c
+ */
 void snd_print_pcm_bits(int pcm, char *buf, int buflen)
 {
         static unsigned int bits[] = { 8, 16, 20, 24, 32 };
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 99552fb5f756..b75da47571e6 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -255,9 +255,13 @@ enum {
  *       in HD-audio specification
  */
 #define AC_PINCAP_HDMI                  (1<<7)  /* HDMI pin */
+#define AC_PINCAP_DP                    (1<<24) /* DisplayPort pin, can
+                                                 * coexist with AC_PINCAP_HDMI
+                                                 */
 #define AC_PINCAP_VREF                  (0x37<<8)
 #define AC_PINCAP_VREF_SHIFT            8
 #define AC_PINCAP_EAPD                  (1<<16) /* EAPD capable */
+#define AC_PINCAP_HBR                   (1<<27) /* High Bit Rate */
 /* Vref status (used in pin cap) */
 #define AC_PINCAP_VREF_HIZ              (1<<0)  /* Hi-Z */
 #define AC_PINCAP_VREF_50               (1<<1)  /* 50% */
@@ -286,6 +290,10 @@ enum {
 #define AC_PWRST_D1SUP                  (1<<1)
 #define AC_PWRST_D2SUP                  (1<<2)
 #define AC_PWRST_D3SUP                  (1<<3)
+#define AC_PWRST_D3COLDSUP              (1<<4)
+#define AC_PWRST_S3D3COLDSUP            (1<<29)
+#define AC_PWRST_CLKSTOP                (1<<30)
+#define AC_PWRST_EPSS                   (1U<<31)
 
 /* Power state values */
 #define AC_PWRST_SETTING                (0xf<<0)
@@ -519,6 +527,9 @@ enum {
 /* max. codec address */
 #define HDA_MAX_CODEC_ADDRESS   0x0f
 
+/* max number of PCM devics per card */
+#define HDA_MAX_PCMS            10
+
 /*
  * generic arrays
  */
@@ -631,6 +642,7 @@ struct hda_bus {
         unsigned int rirb_error:1;      /* error in codec communication */
         unsigned int response_reset:1;  /* controller was reset */
         unsigned int in_reset:1;        /* during reset operation */
+        unsigned int power_keep_link_on:1; /* don't power off HDA link */
 };
 
 /*
@@ -674,6 +686,7 @@ struct hda_codec_ops {
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         int (*check_power_status)(struct hda_codec *codec, hda_nid_t nid);
 #endif
+        void (*reboot_notify)(struct hda_codec *codec);
 };
 
 /* record for amp information cache */
@@ -771,6 +784,7 @@ struct hda_codec {
 
         /* beep device */
         struct hda_beep *beep;
+        unsigned int beep_mode;
 
         /* widget capabilities cache */
         unsigned int num_nodes;
@@ -778,6 +792,7 @@ struct hda_codec {
         u32 *wcaps;
 
         struct snd_array mixers;        /* list of assigned mixer elements */
+        struct snd_array nids;          /* list of mapped mixer elements */
 
         struct hda_cache_rec amp_cache; /* cache for amp access */
         struct hda_cache_rec cmd_cache; /* cache for other commands */
@@ -806,11 +821,15 @@ struct hda_codec {
         unsigned int pin_amp_workaround:1; /* pin out-amp takes index
                                             * (e.g. Conexant codecs)
                                             */
+        unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */
 #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 delayed_work power_work; /* delayed task for powerdown */
+        unsigned long power_on_acct;
+        unsigned long power_off_acct;
+        unsigned long power_jiffies;
 #endif
 
         /* codec-specific additional proc output */
@@ -883,6 +902,7 @@ int snd_hda_codec_set_pincfg(struct hda_codec *codec, hda_nid_t nid,
                              unsigned int cfg);
 int snd_hda_add_pincfg(struct hda_codec *codec, struct snd_array *list,
                        hda_nid_t nid, unsigned int cfg); /* for hwdep */
+void snd_hda_shutup_pins(struct hda_codec *codec);
 
 /*
  * Mixer
@@ -910,6 +930,7 @@ int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,
  * Misc
  */
 void snd_hda_get_codec_name(struct hda_codec *codec, char *name, int namelen);
+void snd_hda_bus_reboot_notify(struct hda_bus *bus);
 
 /*
  * power management
@@ -933,6 +954,7 @@ const char *snd_hda_get_jack_location(u32 cfg);
 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
+void snd_hda_update_power_acct(struct hda_codec *codec);
 #else
 static inline void snd_hda_power_up(struct hda_codec *codec) {}
 static inline void snd_hda_power_down(struct hda_codec *codec) {}
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index 9446a5abea13..d8da18a9e98b 100644
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <asm/unaligned.h>
 #include "hda_codec.h"
@@ -309,17 +310,12 @@ out_fail:
         return -EINVAL;
 }
 
-static int hdmi_present_sense(struct hda_codec *codec, hda_nid_t nid)
-{
-        return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PIN_SENSE, 0);
-}
-
 static int hdmi_eld_valid(struct hda_codec *codec, hda_nid_t nid)
 {
         int eldv;
         int present;
 
-        present = hdmi_present_sense(codec, nid);
+        present = snd_hda_pin_sense(codec, nid);
         eldv    = (present & AC_PINSENSE_ELDV);
         present = (present & AC_PINSENSE_PRESENCE);
 
@@ -336,6 +332,7 @@ int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid)
         return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE,
                                                  AC_DIPSIZE_ELD_BUF);
 }
+EXPORT_SYMBOL_HDA(snd_hdmi_get_eld_size);
 
 int snd_hdmi_get_eld(struct hdmi_eld *eld,
                      struct hda_codec *codec, hda_nid_t nid)
@@ -371,6 +368,7 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
         kfree(buf);
         return ret;
 }
+EXPORT_SYMBOL_HDA(snd_hdmi_get_eld);
 
 static void hdmi_show_short_audio_desc(struct cea_sad *a)
 {
@@ -409,6 +407,7 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen)
         }
         buf[j] = '\0';  /* necessary when j == 0 */
 }
+EXPORT_SYMBOL_HDA(snd_print_channel_allocation);
 
 void snd_hdmi_show_eld(struct hdmi_eld *e)
 {
@@ -427,6 +426,7 @@ void snd_hdmi_show_eld(struct hdmi_eld *e)
         for (i = 0; i < e->sad_count; i++)
                 hdmi_show_short_audio_desc(e->sad + i);
 }
+EXPORT_SYMBOL_HDA(snd_hdmi_show_eld);
 
 #ifdef CONFIG_PROC_FS
 
@@ -477,6 +477,8 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
                 [4 ... 7] = "reserved"
         };
 
+        snd_iprintf(buffer, "monitor_present\t\t%d\n", e->monitor_present);
+        snd_iprintf(buffer, "eld_valid\t\t%d\n", e->eld_valid);
         snd_iprintf(buffer, "monitor_name\t\t%s\n", e->monitor_name);
         snd_iprintf(buffer, "connection_type\t\t%s\n",
                                 eld_connection_type_names[e->conn_type]);
@@ -518,7 +520,11 @@ static void hdmi_write_eld_info(struct snd_info_entry *entry,
                  *      monitor_name manufacture_id product_id
                  *      eld_version edid_version
                  */
-                if (!strcmp(name, "connection_type"))
+                if (!strcmp(name, "monitor_present"))
+                        e->monitor_present = val;
+                else if (!strcmp(name, "eld_valid"))
+                        e->eld_valid = val;
+                else if (!strcmp(name, "connection_type"))
                         e->conn_type = val;
                 else if (!strcmp(name, "port_id"))
                         e->port_id = val;
@@ -560,13 +566,14 @@ static void hdmi_write_eld_info(struct snd_info_entry *entry,
 }
 
 
-int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld)
+int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld,
+                         int index)
 {
         char name[32];
         struct snd_info_entry *entry;
         int err;
 
-        snprintf(name, sizeof(name), "eld#%d", codec->addr);
+        snprintf(name, sizeof(name), "eld#%d.%d", codec->addr, index);
         err = snd_card_proc_new(codec->bus->card, name, &entry);
         if (err < 0)
                 return err;
@@ -578,6 +585,7 @@ int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld)
 
         return 0;
 }
+EXPORT_SYMBOL_HDA(snd_hda_eld_proc_new);
 
 void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld)
 {
@@ -586,5 +594,6 @@ void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld)
                 eld->proc_entry = NULL;
         }
 }
+EXPORT_SYMBOL_HDA(snd_hda_eld_proc_free);
 
 #endif /* CONFIG_PROC_FS */
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index b36f6c5a92df..5ea21285ee1f 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -727,7 +727,8 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
                 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);
-                err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
+                err = snd_hda_ctl_add(codec, node->nid,
+                                        snd_ctl_new1(&knew, codec));
                 if (err < 0)
                         return err;
                 created = 1;
@@ -737,7 +738,8 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
                 if (is_loopback)
                         add_input_loopback(codec, node->nid, HDA_OUTPUT, 0);
                 snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);
-                err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
+                err = snd_hda_ctl_add(codec, node->nid,
+                                        snd_ctl_new1(&knew, codec));
                 if (err < 0)
                         return err;
                 created = 1;
@@ -751,7 +753,8 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
             (node->amp_in_caps & AC_AMPCAP_NUM_STEPS)) {
                 knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node->nid, index, HDA_INPUT);
                 snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index);
-                err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
+                err = snd_hda_ctl_add(codec, node->nid,
+                                        snd_ctl_new1(&knew, codec));
                 if (err < 0)
                         return err;
                 created = 1;
@@ -759,7 +762,8 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
                    (node->amp_out_caps & AC_AMPCAP_NUM_STEPS)) {
                 knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node->nid, 0, HDA_OUTPUT);
                 snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);
-                err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
+                err = snd_hda_ctl_add(codec, node->nid,
+                                        snd_ctl_new1(&knew, codec));
                 if (err < 0)
                         return err;
                 created = 1;
@@ -857,7 +861,8 @@ static int build_input_controls(struct hda_codec *codec)
         }
 
         /* create input MUX if multiple sources are available */
-        err = snd_hda_ctl_add(codec, snd_ctl_new1(&cap_sel, codec));
+        err = snd_hda_ctl_add(codec, spec->adc_node->nid,
+                              snd_ctl_new1(&cap_sel, codec));
         if (err < 0)
                 return err;
 
@@ -875,7 +880,8 @@ static int build_input_controls(struct hda_codec *codec)
                         HDA_CODEC_VOLUME(name, adc_node->nid,
                                          spec->input_mux.items[i].index,
                                          HDA_INPUT);
-                err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
+                err = snd_hda_ctl_add(codec, adc_node->nid,
+                                        snd_ctl_new1(&knew, codec));
                 if (err < 0)
                         return err;
         }
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index cc24e6721d74..a1fc83753cc6 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -24,6 +24,7 @@
 #include <linux/compat.h>
 #include <linux/mutex.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <linux/firmware.h>
 #include <sound/core.h>
 #include "hda_codec.h"
@@ -154,6 +155,44 @@ int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec)
         return 0;
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static ssize_t power_on_acct_show(struct device *dev,
+                                  struct device_attribute *attr,
+                                  char *buf)
+{
+        struct snd_hwdep *hwdep = dev_get_drvdata(dev);
+        struct hda_codec *codec = hwdep->private_data;
+        snd_hda_update_power_acct(codec);
+        return sprintf(buf, "%u\n", jiffies_to_msecs(codec->power_on_acct));
+}
+
+static ssize_t power_off_acct_show(struct device *dev,
+                                   struct device_attribute *attr,
+                                   char *buf)
+{
+        struct snd_hwdep *hwdep = dev_get_drvdata(dev);
+        struct hda_codec *codec = hwdep->private_data;
+        snd_hda_update_power_acct(codec);
+        return sprintf(buf, "%u\n", jiffies_to_msecs(codec->power_off_acct));
+}
+
+static struct device_attribute power_attrs[] = {
+        __ATTR_RO(power_on_acct),
+        __ATTR_RO(power_off_acct),
+};
+
+int snd_hda_hwdep_add_power_sysfs(struct hda_codec *codec)
+{
+        struct snd_hwdep *hwdep = codec->hwdep;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(power_attrs); i++)
+                snd_add_device_sysfs_file(SNDRV_DEVICE_TYPE_HWDEP, hwdep->card,
+                                          hwdep->device, &power_attrs[i]);
+        return 0;
+}
+#endif /* CONFIG_SND_HDA_POWER_SAVE */
+
 #ifdef CONFIG_SND_HDA_RECONFIG
 
 /*
@@ -254,8 +293,11 @@ static ssize_t type##_store(struct device *dev,			\
 {                                                               \
         struct snd_hwdep *hwdep = dev_get_drvdata(dev);         \
         struct hda_codec *codec = hwdep->private_data;          \
-        char *after;                                            \
-        codec->type = simple_strtoul(buf, &after, 0);           \
+        unsigned long val;                                      \
+        int err = strict_strtoul(buf, 0, &val);                 \
+        if (err < 0)                                            \
+                return err;                                     \
+        codec->type = val;                                      \
         return count;                                           \
 }
 
@@ -390,8 +432,7 @@ static int parse_hints(struct hda_codec *codec, const char *buf)
         char *key, *val;
         struct hda_hint *hint;
 
-        while (isspace(*buf))
-                buf++;
+        buf = skip_spaces(buf);
         if (!*buf || *buf == '#' || *buf == '\n')
                 return 0;
         if (*buf == '=')
@@ -406,8 +447,7 @@ static int parse_hints(struct hda_codec *codec, const char *buf)
                 return -EINVAL;
         }
         *val++ = 0;
-        while (isspace(*val))
-                val++;
+        val = skip_spaces(val);
         remove_trail_spaces(key);
         remove_trail_spaces(val);
         hint = get_hint(codec, key);
@@ -585,6 +625,10 @@ enum {
         LINE_MODE_PINCFG,
         LINE_MODE_VERB,
         LINE_MODE_HINT,
+        LINE_MODE_VENDOR_ID,
+        LINE_MODE_SUBSYSTEM_ID,
+        LINE_MODE_REVISION_ID,
+        LINE_MODE_CHIP_NAME,
         NUM_LINE_MODES,
 };
 
@@ -614,53 +658,71 @@ static void parse_codec_mode(char *buf, struct hda_bus *bus,
 }
 
 /* parse the contents after the other command tags, [pincfg], [verb],
- * [hint] and [model]
+ * [vendor_id], [subsystem_id], [revision_id], [chip_name], [hint] and [model]
  * just pass to the sysfs helper (only when any codec was specified)
  */
 static void parse_pincfg_mode(char *buf, struct hda_bus *bus,
                               struct hda_codec **codecp)
 {
-        if (!*codecp)
-                return;
         parse_user_pin_configs(*codecp, buf);
 }
 
 static void parse_verb_mode(char *buf, struct hda_bus *bus,
                             struct hda_codec **codecp)
 {
-        if (!*codecp)
-                return;
         parse_init_verbs(*codecp, buf);
 }
 
 static void parse_hint_mode(char *buf, struct hda_bus *bus,
                             struct hda_codec **codecp)
 {
-        if (!*codecp)
-                return;
         parse_hints(*codecp, buf);
 }
 
 static void parse_model_mode(char *buf, struct hda_bus *bus,
                              struct hda_codec **codecp)
 {
-        if (!*codecp)
-                return;
         kfree((*codecp)->modelname);
         (*codecp)->modelname = kstrdup(buf, GFP_KERNEL);
 }
 
+static void parse_chip_name_mode(char *buf, struct hda_bus *bus,
+                                 struct hda_codec **codecp)
+{
+        kfree((*codecp)->chip_name);
+        (*codecp)->chip_name = kstrdup(buf, GFP_KERNEL);
+}
+
+#define DEFINE_PARSE_ID_MODE(name) \
+static void parse_##name##_mode(char *buf, struct hda_bus *bus, \
+                                 struct hda_codec **codecp) \
+{ \
+        unsigned long val; \
+        if (!strict_strtoul(buf, 0, &val)) \
+                (*codecp)->name = val; \
+}
+
+DEFINE_PARSE_ID_MODE(vendor_id);
+DEFINE_PARSE_ID_MODE(subsystem_id);
+DEFINE_PARSE_ID_MODE(revision_id);
+
+
 struct hda_patch_item {
         const char *tag;
         void (*parser)(char *buf, struct hda_bus *bus, struct hda_codec **retc);
+        int need_codec;
 };
 
 static struct hda_patch_item patch_items[NUM_LINE_MODES] = {
-        [LINE_MODE_CODEC] = { "[codec]", parse_codec_mode },
-        [LINE_MODE_MODEL] = { "[model]", parse_model_mode },
-        [LINE_MODE_VERB] = { "[verb]", parse_verb_mode },
-        [LINE_MODE_PINCFG] = { "[pincfg]", parse_pincfg_mode },
-        [LINE_MODE_HINT] = { "[hint]", parse_hint_mode },
+        [LINE_MODE_CODEC] = { "[codec]", parse_codec_mode, 0 },
+        [LINE_MODE_MODEL] = { "[model]", parse_model_mode, 1 },
+        [LINE_MODE_VERB] = { "[verb]", parse_verb_mode, 1 },
+        [LINE_MODE_PINCFG] = { "[pincfg]", parse_pincfg_mode, 1 },
+        [LINE_MODE_HINT] = { "[hint]", parse_hint_mode, 1 },
+        [LINE_MODE_VENDOR_ID] = { "[vendor_id]", parse_vendor_id_mode, 1 },
+        [LINE_MODE_SUBSYSTEM_ID] = { "[subsystem_id]", parse_subsystem_id_mode, 1 },
+        [LINE_MODE_REVISION_ID] = { "[revision_id]", parse_revision_id_mode, 1 },
+        [LINE_MODE_CHIP_NAME] = { "[chip_name]", parse_chip_name_mode, 1 },
 };
 
 /* check the line starting with '[' -- change the parser mode accodingly */
@@ -743,7 +805,8 @@ int snd_hda_load_patch(struct hda_bus *bus, const char *patch)
                         continue;
                 if (*buf == '[')
                         line_mode = parse_line_mode(buf, bus);
-                else if (patch_items[line_mode].parser)
+                else if (patch_items[line_mode].parser &&
+                         (codec || !patch_items[line_mode].need_codec))
                         patch_items[line_mode].parser(buf, bus, &codec);
         }
         release_firmware(fw);
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 6517f589d01d..cec68152dcb1 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -60,10 +60,14 @@ static int bdl_pos_adj[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};
 static int probe_mask[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};
 static int probe_only[SNDRV_CARDS];
 static int single_cmd;
-static int enable_msi;
+static int enable_msi = -1;
 #ifdef CONFIG_SND_HDA_PATCH_LOADER
 static char *patch[SNDRV_CARDS];
 #endif
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
+static int beep_mode[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] =
+                                        CONFIG_SND_HDA_INPUT_BEEP_MODE};
+#endif
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Intel HD audio interface.");
@@ -91,6 +95,11 @@ MODULE_PARM_DESC(enable_msi, "Enable Message Signaled Interrupt (MSI)");
 module_param_array(patch, charp, NULL, 0444);
 MODULE_PARM_DESC(patch, "Patch file for Intel HD audio interface.");
 #endif
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
+module_param_array(beep_mode, int, NULL, 0444);
+MODULE_PARM_DESC(beep_mode, "Select HDA Beep registration mode "
+                            "(0=off, 1=on, 2=mute switch on/off) (default=1).");
+#endif
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
 static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
@@ -116,6 +125,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
                          "{Intel, ICH9},"
                          "{Intel, ICH10},"
                          "{Intel, PCH},"
+                         "{Intel, CPT},"
                          "{Intel, SCH},"
                          "{ATI, SB450},"
                          "{ATI, SB600},"
@@ -250,8 +260,6 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
 #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_PCMS            8
 
 /* RIRB int mask: overrun[2], response[0] */
 #define RIRB_INT_RESPONSE       0x01
@@ -259,7 +267,8 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
 #define RIRB_INT_MASK           0x05
 
 /* STATESTS int mask: S3,SD2,SD1,SD0 */
-#define AZX_MAX_CODECS          4
+#define AZX_MAX_CODECS          8
+#define AZX_DEFAULT_CODECS      4
 #define STATESTS_INT_MASK       ((1 << AZX_MAX_CODECS) - 1)
 
 /* SD_CTL bits */
@@ -347,6 +356,7 @@ struct azx_dev {
                                          */
         unsigned char stream_tag;       /* assigned stream */
         unsigned char index;            /* stream index */
+        int device;                     /* last device number assigned to */
 
         unsigned int opened :1;
         unsigned int running :1;
@@ -398,12 +408,13 @@ struct azx {
         struct azx_dev *azx_dev;
 
         /* PCM */
-        struct snd_pcm *pcm[AZX_MAX_PCMS];
+        struct snd_pcm *pcm[HDA_MAX_PCMS];
 
         /* HD codec */
         unsigned short codec_mask;
         int  codec_probe_mask; /* copied from probe_mask option */
         struct hda_bus *bus;
+        unsigned int beep_mode;
 
         /* CORB/RIRB */
         struct azx_rb corb;
@@ -415,6 +426,7 @@ struct azx {
 
         /* flags */
         int position_fix;
+        int poll_count;
         unsigned int running :1;
         unsigned int initialized :1;
         unsigned int single_cmd :1;
@@ -437,6 +449,7 @@ struct azx {
 /* driver types */
 enum {
         AZX_DRIVER_ICH,
+        AZX_DRIVER_PCH,
         AZX_DRIVER_SCH,
         AZX_DRIVER_ATI,
         AZX_DRIVER_ATIHDMI,
@@ -451,6 +464,7 @@ enum {
 
 static char *driver_short_names[] __devinitdata = {
         [AZX_DRIVER_ICH] = "HDA Intel",
+        [AZX_DRIVER_PCH] = "HDA Intel PCH",
         [AZX_DRIVER_SCH] = "HDA Intel MID",
         [AZX_DRIVER_ATI] = "HDA ATI SB",
         [AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI",
@@ -495,7 +509,7 @@ static char *driver_short_names[] __devinitdata = {
 #define get_azx_dev(substream) (substream->runtime->private_data)
 
 static int azx_acquire_irq(struct azx *chip, int do_disconnect);
-
+static int azx_send_cmd(struct hda_bus *bus, unsigned int val);
 /*
  * Interface for HD codec
  */
@@ -653,11 +667,12 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
 {
         struct azx *chip = bus->private_data;
         unsigned long timeout;
+        int do_poll = 0;
 
  again:
         timeout = jiffies + msecs_to_jiffies(1000);
         for (;;) {
-                if (chip->polling_mode) {
+                if (chip->polling_mode || do_poll) {
                         spin_lock_irq(&chip->reg_lock);
                         azx_update_rirb(chip);
                         spin_unlock_irq(&chip->reg_lock);
@@ -665,6 +680,9 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
                 if (!chip->rirb.cmds[addr]) {
                         smp_rmb();
                         bus->rirb_error = 0;
+
+                        if (!do_poll)
+                                chip->poll_count = 0;
                         return chip->rirb.res[addr]; /* the last value */
                 }
                 if (time_after(jiffies, timeout))
@@ -677,6 +695,24 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
                 }
         }
 
+        if (!chip->polling_mode && chip->poll_count < 2) {
+                snd_printdd(SFX "azx_get_response timeout, "
+                           "polling the codec once: last cmd=0x%08x\n",
+                           chip->last_cmd[addr]);
+                do_poll = 1;
+                chip->poll_count++;
+                goto again;
+        }
+
+
+        if (!chip->polling_mode) {
+                snd_printk(KERN_WARNING SFX "azx_get_response timeout, "
+                           "switching to polling mode: last cmd=0x%08x\n",
+                           chip->last_cmd[addr]);
+                chip->polling_mode = 1;
+                goto again;
+        }
+
         if (chip->msi) {
                 snd_printk(KERN_WARNING SFX "No response from codec, "
                            "disabling MSI: last cmd=0x%08x\n",
@@ -692,14 +728,6 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
                 goto again;
         }
 
-        if (!chip->polling_mode) {
-                snd_printk(KERN_WARNING SFX "azx_get_response timeout, "
-                           "switching to polling mode: last cmd=0x%08x\n",
-                           chip->last_cmd[addr]);
-                chip->polling_mode = 1;
-                goto again;
-        }
-
         if (chip->probing) {
                 /* If this critical timeout happens during the codec probing
                  * phase, this is likely an access to a non-existing codec
@@ -942,8 +970,8 @@ static void azx_stream_start(struct azx *chip, struct azx_dev *azx_dev)
         azx_dev->insufficient = 1;
 
         /* enable SIE */
-        azx_writeb(chip, INTCTL,
-                   azx_readb(chip, INTCTL) | (1 << azx_dev->index));
+        azx_writel(chip, INTCTL,
+                   azx_readl(chip, INTCTL) | (1 << azx_dev->index));
         /* set DMA start and interrupt mask */
         azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) |
                       SD_CTL_DMA_START | SD_INT_MASK);
@@ -962,8 +990,8 @@ static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
 {
         azx_stream_clear(chip, azx_dev);
         /* disable SIE */
-        azx_writeb(chip, INTCTL,
-                   azx_readb(chip, INTCTL) & ~(1 << azx_dev->index));
+        azx_writel(chip, INTCTL,
+                   azx_readl(chip, INTCTL) & ~(1 << azx_dev->index));
 }
 
 
@@ -1039,6 +1067,7 @@ static void azx_init_pci(struct azx *chip)
                                 0x01, NVIDIA_HDA_ENABLE_COHBIT);
                 break;
         case AZX_DRIVER_SCH:
+        case AZX_DRIVER_PCH:
                 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,
@@ -1324,7 +1353,7 @@ static void azx_bus_reset(struct hda_bus *bus)
         if (chip->initialized) {
                 int i;
 
-                for (i = 0; i < AZX_MAX_PCMS; i++)
+                for (i = 0; i < HDA_MAX_PCMS; i++)
                         snd_pcm_suspend_all(chip->pcm[i]);
                 snd_hda_suspend(chip->bus);
                 snd_hda_resume(chip->bus);
@@ -1339,6 +1368,7 @@ static void azx_bus_reset(struct hda_bus *bus)
 
 /* number of codec slots for each chipset: 0 = default slots (i.e. 4) */
 static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] __devinitdata = {
+        [AZX_DRIVER_NVIDIA] = 8,
         [AZX_DRIVER_TERA] = 1,
 };
 
@@ -1371,7 +1401,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model)
         codecs = 0;
         max_slots = azx_max_codecs[chip->driver_type];
         if (!max_slots)
-                max_slots = AZX_MAX_CODECS;
+                max_slots = AZX_DEFAULT_CODECS;
 
         /* First try to probe all given codec slots */
         for (c = 0; c < max_slots; c++) {
@@ -1386,7 +1416,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model)
                                 chip->codec_mask &= ~(1 << c);
                                 /* More badly, accessing to a non-existing
                                  * codec often screws up the controller chip,
-                                 * and distrubs the further communications.
+                                 * and disturbs the further communications.
                                  * Thus if an error occurs during probing,
                                  * better to reset the controller chip to
                                  * get back to the sanity state.
@@ -1404,6 +1434,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model)
                         err = snd_hda_codec_new(chip->bus, c, &codec);
                         if (err < 0)
                                 continue;
+                        codec->beep_mode = chip->beep_mode;
                         codecs++;
                 }
         }
@@ -1430,10 +1461,13 @@ static int __devinit azx_codec_configure(struct azx *chip)
  */
 
 /* assign a stream for the PCM */
-static inline struct azx_dev *azx_assign_device(struct azx *chip, int stream)
+static inline struct azx_dev *
+azx_assign_device(struct azx *chip, struct snd_pcm_substream *substream)
 {
         int dev, i, nums;
-        if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+        struct azx_dev *res = NULL;
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 dev = chip->playback_index_offset;
                 nums = chip->playback_streams;
         } else {
@@ -1442,10 +1476,15 @@ static inline struct azx_dev *azx_assign_device(struct azx *chip, int stream)
         }
         for (i = 0; i < nums; i++, dev++)
                 if (!chip->azx_dev[dev].opened) {
-                        chip->azx_dev[dev].opened = 1;
-                        return &chip->azx_dev[dev];
+                        res = &chip->azx_dev[dev];
+                        if (res->device == substream->pcm->device)
+                                break;
                 }
-        return NULL;
+        if (res) {
+                res->opened = 1;
+                res->device = substream->pcm->device;
+        }
+        return res;
 }
 
 /* release the assigned stream */
@@ -1494,7 +1533,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
         int err;
 
         mutex_lock(&chip->open_mutex);
-        azx_dev = azx_assign_device(chip, substream->stream);
+        azx_dev = azx_assign_device(chip, substream);
         if (azx_dev == NULL) {
                 mutex_unlock(&chip->open_mutex);
                 return -EBUSY;
@@ -1858,6 +1897,9 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
 
         if (!bdl_pos_adj[chip->dev_index])
                 return 1; /* no delayed ack */
+        if (WARN_ONCE(!azx_dev->period_bytes,
+                      "hda-intel: zero azx_dev->period_bytes"))
+                return 0; /* this shouldn't happen! */
         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 */
@@ -1945,7 +1987,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
         int pcm_dev = cpcm->device;
         int s, err;
 
-        if (pcm_dev >= AZX_MAX_PCMS) {
+        if (pcm_dev >= HDA_MAX_PCMS) {
                 snd_printk(KERN_ERR SFX "Invalid PCM device number %d\n",
                            pcm_dev);
                 return -EINVAL;
@@ -2023,7 +2065,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect)
 {
         if (request_irq(chip->pci->irq, azx_interrupt,
                         chip->msi ? 0 : IRQF_SHARED,
-                        "HDA Intel", chip)) {
+                        "hda_intel", chip)) {
                 printk(KERN_ERR "hda-intel: unable to grab IRQ %d, "
                        "disabling device\n", chip->pci->irq);
                 if (do_disconnect)
@@ -2071,7 +2113,8 @@ static void azx_power_notify(struct hda_bus *bus)
         }
         if (power_on)
                 azx_init_chip(chip);
-        else if (chip->running && power_save_controller)
+        else if (chip->running && power_save_controller &&
+                 !bus->power_keep_link_on)
                 azx_stop_chip(chip);
 }
 #endif /* CONFIG_SND_HDA_POWER_SAVE */
@@ -2100,7 +2143,7 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         azx_clear_irq_pending(chip);
-        for (i = 0; i < AZX_MAX_PCMS; i++)
+        for (i = 0; i < HDA_MAX_PCMS; i++)
                 snd_pcm_suspend_all(chip->pcm[i]);
         if (chip->initialized)
                 snd_hda_suspend(chip->bus);
@@ -2154,6 +2197,7 @@ static int azx_resume(struct pci_dev *pci)
 static int azx_halt(struct notifier_block *nb, unsigned long event, void *buf)
 {
         struct azx *chip = container_of(nb, struct azx, reboot_notifier);
+        snd_hda_bus_reboot_notify(chip->bus);
         azx_stop_chip(chip);
         return NOTIFY_OK;
 }
@@ -2221,7 +2265,16 @@ static int azx_dev_free(struct snd_device *device)
 static struct snd_pci_quirk position_fix_list[] __devinitdata = {
         SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),
         {}
 };
 
@@ -2304,11 +2357,14 @@ static void __devinit check_probe_mask(struct azx *chip, int dev)
 }
 
 /*
- * white-list for enable_msi
+ * white/black-list for enable_msi
  */
-static struct snd_pci_quirk msi_white_list[] __devinitdata = {
-        SND_PCI_QUIRK(0x103c, 0x30f7, "HP Pavilion dv4t-1300", 1),
-        SND_PCI_QUIRK(0x103c, 0x3607, "HP Compa CQ40", 1),
+static struct snd_pci_quirk msi_black_list[] __devinitdata = {
+        SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */
+        SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */
+        SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */
+        SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */
+        SND_PCI_QUIRK(0xa0a0, 0x0575, "Aopen MZ915-M", 0), /* ICH6 */
         {}
 };
 
@@ -2316,15 +2372,24 @@ static void __devinit check_msi(struct azx *chip)
 {
         const struct snd_pci_quirk *q;
 
-        chip->msi = enable_msi;
-        if (chip->msi)
+        if (enable_msi >= 0) {
+                chip->msi = !!enable_msi;
                 return;
-        q = snd_pci_quirk_lookup(chip->pci, msi_white_list);
+        }
+        chip->msi = 1;  /* enable MSI as default */
+        q = snd_pci_quirk_lookup(chip->pci, msi_black_list);
         if (q) {
                 printk(KERN_INFO
                        "hda_intel: msi for device %04x:%04x set to %d\n",
                        q->subvendor, q->subdevice, q->value);
                 chip->msi = q->value;
+                return;
+        }
+
+        /* NVidia chipsets seem to cause troubles with MSI */
+        if (chip->driver_type == AZX_DRIVER_NVIDIA) {
+                printk(KERN_INFO "hda_intel: Disable MSI for Nvidia chipset\n");
+                chip->msi = 0;
         }
 }
 
@@ -2374,6 +2439,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         if (bdl_pos_adj[dev] < 0) {
                 switch (chip->driver_type) {
                 case AZX_DRIVER_ICH:
+                case AZX_DRIVER_PCH:
                         bdl_pos_adj[dev] = 1;
                         break;
                 default:
@@ -2436,6 +2502,11 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
                 }
         }
 
+        /* disable 64bit DMA address for Teradici */
+        /* it does not work with device 6549:1200 subsys e4a2:040b */
+        if (chip->driver_type == AZX_DRIVER_TERA)
+                gcap &= ~ICH6_GCAP_64OK;
+
         /* allow 64bit DMA address if supported by H/W */
         if ((gcap & ICH6_GCAP_64OK) && !pci_set_dma_mask(pci, DMA_BIT_MASK(64)))
                 pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(64));
@@ -2578,6 +2649,10 @@ static int __devinit azx_probe(struct pci_dev *pci,
                 goto out_free;
         card->private_data = chip;
 
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
+        chip->beep_mode = beep_mode[dev];
+#endif
+
         /* create codec instances */
         err = azx_codec_create(chip, model[dev]);
         if (err < 0)
@@ -2630,7 +2705,7 @@ static void __devexit azx_remove(struct pci_dev *pci)
 }
 
 /* PCI IDs */
-static struct pci_device_id azx_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
         /* ICH 6..10 */
         { PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH },
         { PCI_DEVICE(0x8086, 0x27d8), .driver_data = AZX_DRIVER_ICH },
@@ -2643,6 +2718,9 @@ static struct pci_device_id azx_ids[] = {
         { PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH },
         /* PCH */
         { PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_ICH },
+        { PCI_DEVICE(0x8086, 0x3b57), .driver_data = AZX_DRIVER_ICH },
+        /* CPT */
+        { PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_PCH },
         /* SCH */
         { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },
         /* ATI SB 450/600 */
@@ -2670,29 +2748,10 @@ static struct pci_device_id azx_ids[] = {
         /* 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, 0x0590), .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, 0x0d94), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0d95), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0d96), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0d97), .driver_data = AZX_DRIVER_NVIDIA },
+        { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
+          .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
+          .class_mask = 0xffffff,
+          .driver_data = AZX_DRIVER_NVIDIA },
         /* Teradici */
         { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA },
         /* Creative X-Fi (CA0110-IBG) */
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 5f1dcc59002b..7cee364976ff 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -23,6 +23,16 @@
 #ifndef __SOUND_HDA_LOCAL_H
 #define __SOUND_HDA_LOCAL_H
 
+/* We abuse kcontrol_new.subdev field to pass the NID corresponding to
+ * the given new control.  If id.subdev has a bit flag HDA_SUBDEV_NID_FLAG,
+ * snd_hda_ctl_add() takes the lower-bit subdev value as a valid NID.
+ * 
+ * Note that the subdevice field is cleared again before the real registration
+ * in snd_hda_ctl_add(), so that this value won't appear in the outside.
+ */
+#define HDA_SUBDEV_NID_FLAG     (1U << 31)
+#define HDA_SUBDEV_AMP_FLAG     (1U << 30)
+
 /*
  * for mixer controls
  */
@@ -33,6 +43,7 @@
 /* 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,  \
+          .subdevice = HDA_SUBDEV_AMP_FLAG, \
           .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \
                     SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
                     SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \
@@ -53,6 +64,7 @@
 /* mono mute switch with index (index=0,1,...) (channel=1,2) */
 #define HDA_CODEC_MUTE_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \
+          .subdevice = HDA_SUBDEV_AMP_FLAG, \
           .info = snd_hda_mixer_amp_switch_info, \
           .get = snd_hda_mixer_amp_switch_get, \
           .put = snd_hda_mixer_amp_switch_put, \
@@ -66,6 +78,28 @@
 /* stereo mute switch */
 #define HDA_CODEC_MUTE(xname, nid, xindex, direction) \
         HDA_CODEC_MUTE_MONO(xname, nid, 3, xindex, direction)
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
+/* special beep mono mute switch with index (index=0,1,...) (channel=1,2) */
+#define HDA_CODEC_MUTE_BEEP_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \
+          .subdevice = HDA_SUBDEV_AMP_FLAG, \
+          .info = snd_hda_mixer_amp_switch_info, \
+          .get = snd_hda_mixer_amp_switch_get, \
+          .put = snd_hda_mixer_amp_switch_put_beep, \
+          .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }
+#else
+/* no digital beep - just the standard one */
+#define HDA_CODEC_MUTE_BEEP_MONO_IDX(xname, xcidx, nid, ch, xidx, dir) \
+        HDA_CODEC_MUTE_MONO_IDX(xname, xcidx, nid, ch, xidx, dir)
+#endif /* CONFIG_SND_HDA_INPUT_BEEP */
+/* special beep mono mute switch */
+#define HDA_CODEC_MUTE_BEEP_MONO(xname, nid, channel, xindex, direction) \
+        HDA_CODEC_MUTE_BEEP_MONO_IDX(xname, 0, nid, channel, xindex, direction)
+/* special beep stereo mute switch */
+#define HDA_CODEC_MUTE_BEEP(xname, nid, xindex, direction) \
+        HDA_CODEC_MUTE_BEEP_MONO(xname, nid, 3, xindex, direction)
+
+extern const char *snd_hda_pcm_type_name[];
 
 int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_info *uinfo);
@@ -81,6 +115,10 @@ 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);
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
+int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol);
+#endif
 /* 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);
@@ -424,8 +462,23 @@ 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);
 u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid);
+u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid);
+int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid);
 
-int snd_hda_ctl_add(struct hda_codec *codec, struct snd_kcontrol *kctl);
+/* flags for hda_nid_item */
+#define HDA_NID_ITEM_AMP        (1<<0)
+
+struct hda_nid_item {
+        struct snd_kcontrol *kctl;
+        unsigned int index;
+        hda_nid_t nid;
+        unsigned short flags;
+};
+
+int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid,
+                    struct snd_kcontrol *kctl);
+int snd_hda_add_nid(struct hda_codec *codec, struct snd_kcontrol *kctl,
+                    unsigned int index, hda_nid_t nid);
 void snd_hda_ctls_clear(struct hda_codec *codec);
 
 /*
@@ -437,6 +490,15 @@ int snd_hda_create_hwdep(struct hda_codec *codec);
 static inline int snd_hda_create_hwdep(struct hda_codec *codec) { return 0; }
 #endif
 
+#if defined(CONFIG_SND_HDA_POWER_SAVE) && defined(CONFIG_SND_HDA_HWDEP)
+int snd_hda_hwdep_add_power_sysfs(struct hda_codec *codec);
+#else
+static inline int snd_hda_hwdep_add_power_sysfs(struct hda_codec *codec)
+{
+        return 0;
+}
+#endif
+
 #ifdef CONFIG_SND_HDA_RECONFIG
 int snd_hda_hwdep_add_sysfs(struct hda_codec *codec);
 #else
@@ -490,7 +552,8 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec,
  * AMP control callbacks
  */
 /* retrieve parameters from private_value */
-#define get_amp_nid(kc)         ((kc)->private_value & 0xffff)
+#define get_amp_nid_(pv)        ((pv) & 0xffff)
+#define get_amp_nid(kc)         get_amp_nid_((kc)->private_value)
 #define get_amp_channels(kc)    (((kc)->private_value >> 16) & 0x3)
 #define get_amp_direction(kc)   (((kc)->private_value >> 18) & 0x1)
 #define get_amp_index(kc)       (((kc)->private_value >> 19) & 0xf)
@@ -516,9 +579,11 @@ struct cea_sad {
  * ELD: EDID Like Data
  */
 struct hdmi_eld {
+        bool    monitor_present;
+        bool    eld_valid;
         int     eld_size;
         int     baseline_len;
-        int     eld_ver;        /* (eld_ver == 0) indicates invalid ELD */
+        int     eld_ver;
         int     cea_edid_ver;
         char    monitor_name[ELD_MAX_MNL + 1];
         int     manufacture_id;
@@ -541,11 +606,13 @@ int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t);
 void snd_hdmi_show_eld(struct hdmi_eld *eld);
 
 #ifdef CONFIG_PROC_FS
-int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld);
+int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld,
+                         int index);
 void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld);
 #else
 static inline int snd_hda_eld_proc_new(struct hda_codec *codec,
-                                       struct hdmi_eld *eld)
+                                       struct hdmi_eld *eld,
+                                       int index)
 {
         return 0;
 }
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 95f24e4729f8..f97d35de66c4 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -26,6 +26,21 @@
 #include "hda_codec.h"
 #include "hda_local.h"
 
+static char *bits_names(unsigned int bits, char *names[], int size)
+{
+        int i, n;
+        static char buf[128];
+
+        for (i = 0, n = 0; i < size; i++) {
+                if (bits & (1U<<i) && names[i])
+                        n += snprintf(buf + n, sizeof(buf) - n, " %s",
+                                      names[i]);
+        }
+        buf[n] = '\0';
+
+        return buf;
+}
+
 static const char *get_wid_type_name(unsigned int wid_value)
 {
         static char *names[16] = {
@@ -46,6 +61,52 @@ static const char *get_wid_type_name(unsigned int wid_value)
                 return "UNKNOWN Widget";
 }
 
+static void print_nid_array(struct snd_info_buffer *buffer,
+                            struct hda_codec *codec, hda_nid_t nid,
+                            struct snd_array *array)
+{
+        int i;
+        struct hda_nid_item *items = array->list, *item;
+        struct snd_kcontrol *kctl;
+        for (i = 0; i < array->used; i++) {
+                item = &items[i];
+                if (item->nid == nid) {
+                        kctl = item->kctl;
+                        snd_iprintf(buffer,
+                          "  Control: name=\"%s\", index=%i, device=%i\n",
+                          kctl->id.name, kctl->id.index + item->index,
+                          kctl->id.device);
+                        if (item->flags & HDA_NID_ITEM_AMP)
+                                snd_iprintf(buffer,
+                                  "    ControlAmp: chs=%lu, dir=%s, "
+                                  "idx=%lu, ofs=%lu\n",
+                                  get_amp_channels(kctl),
+                                  get_amp_direction(kctl) ? "Out" : "In",
+                                  get_amp_index(kctl),
+                                  get_amp_offset(kctl));
+                }
+        }
+}
+
+static void print_nid_pcms(struct snd_info_buffer *buffer,
+                           struct hda_codec *codec, hda_nid_t nid)
+{
+        int pcm, type;
+        struct hda_pcm *cpcm;
+        for (pcm = 0; pcm < codec->num_pcms; pcm++) {
+                cpcm = &codec->pcm_info[pcm];
+                for (type = 0; type < 2; type++) {
+                        if (cpcm->stream[type].nid != nid || cpcm->pcm == NULL)
+                                continue;
+                        snd_iprintf(buffer, "  Device: name=\"%s\", "
+                                    "type=\"%s\", device=%i\n",
+                                    cpcm->name,
+                                    snd_hda_pcm_type_name[cpcm->pcm_type],
+                                    cpcm->pcm->device);
+                }
+        }
+}
+
 static void print_amp_caps(struct snd_info_buffer *buffer,
                            struct hda_codec *codec, hda_nid_t nid, int dir)
 {
@@ -190,9 +251,14 @@ static void print_pin_caps(struct snd_info_buffer *buffer,
                 /* Realtek uses this bit as a different meaning */
                 if ((codec->vendor_id >> 16) == 0x10ec)
                         snd_iprintf(buffer, " R/L");
-                else
+                else {
+                        if (caps & AC_PINCAP_HBR)
+                                snd_iprintf(buffer, " HBR");
                         snd_iprintf(buffer, " HDMI");
+                }
         }
+        if (caps & AC_PINCAP_DP)
+                snd_iprintf(buffer, " DP");
         if (caps & AC_PINCAP_TRIG_REQ)
                 snd_iprintf(buffer, " Trigger");
         if (caps & AC_PINCAP_IMP_SENSE)
@@ -363,8 +429,24 @@ static const char *get_pwr_state(u32 state)
 static void print_power_state(struct snd_info_buffer *buffer,
                               struct hda_codec *codec, hda_nid_t nid)
 {
+        static char *names[] = {
+                [ilog2(AC_PWRST_D0SUP)]         = "D0",
+                [ilog2(AC_PWRST_D1SUP)]         = "D1",
+                [ilog2(AC_PWRST_D2SUP)]         = "D2",
+                [ilog2(AC_PWRST_D3SUP)]         = "D3",
+                [ilog2(AC_PWRST_D3COLDSUP)]     = "D3cold",
+                [ilog2(AC_PWRST_S3D3COLDSUP)]   = "S3D3cold",
+                [ilog2(AC_PWRST_CLKSTOP)]       = "CLKSTOP",
+                [ilog2(AC_PWRST_EPSS)]          = "EPSS",
+        };
+
+        int sup = snd_hda_param_read(codec, nid, AC_PAR_POWER_STATE);
         int pwr = snd_hda_codec_read(codec, nid, 0,
                                      AC_VERB_GET_POWER_STATE, 0);
+        if (sup)
+                snd_iprintf(buffer, "  Power states: %s\n",
+                            bits_names(sup, names, ARRAY_SIZE(names)));
+
         snd_iprintf(buffer, "  Power: setting=%s, actual=%s\n",
                     get_pwr_state(pwr & AC_PWRST_SETTING),
                     get_pwr_state((pwr & AC_PWRST_ACTUAL) >>
@@ -457,6 +539,8 @@ static void print_gpio(struct snd_info_buffer *buffer,
                             (data & (1<<i)) ? 1 : 0,
                             (unsol & (1<<i)) ? 1 : 0);
         /* FIXME: add GPO and GPI pin information */
+        print_nid_array(buffer, codec, nid, &codec->mixers);
+        print_nid_array(buffer, codec, nid, &codec->nids);
 }
 
 static void print_codec_info(struct snd_info_entry *entry,
@@ -536,6 +620,10 @@ static void print_codec_info(struct snd_info_entry *entry,
                         snd_iprintf(buffer, " CP");
                 snd_iprintf(buffer, "\n");
 
+                print_nid_array(buffer, codec, nid, &codec->mixers);
+                print_nid_array(buffer, codec, nid, &codec->nids);
+                print_nid_pcms(buffer, codec, nid);
+
                 /* volume knob is a special widget that always have connection
                  * list
                  */
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 2d603f6aba63..e9fdfc4b1c57 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -72,7 +72,8 @@ struct ad198x_spec {
         hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
 
         unsigned int jack_present :1;
-        unsigned int inv_jack_detect:1;
+        unsigned int inv_jack_detect:1; /* inverted jack-detection */
+        unsigned int inv_eapd:1;        /* inverted EAPD implementation */
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         struct hda_loopback_check loopback;
@@ -156,19 +157,24 @@ static const char *ad_slave_sws[] = {
 
 static void ad198x_free_kctls(struct hda_codec *codec);
 
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
 /* additional beep mixers; the actual parameters are overwritten at build */
 static struct snd_kcontrol_new ad_beep_mixer[] = {
         HDA_CODEC_VOLUME("Beep Playback Volume", 0, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0, 0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_BEEP("Beep Playback Switch", 0, 0, HDA_OUTPUT),
         { } /* end */
 };
 
 #define set_beep_amp(spec, nid, idx, dir) \
         ((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir)) /* mono */
+#else
+#define set_beep_amp(spec, nid, idx, dir) /* NOP */
+#endif
 
 static int ad198x_build_controls(struct hda_codec *codec)
 {
         struct ad198x_spec *spec = codec->spec;
+        struct snd_kcontrol *kctl;
         unsigned int i;
         int err;
 
@@ -194,6 +200,7 @@ static int ad198x_build_controls(struct hda_codec *codec)
         }
 
         /* create beep controls if needed */
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
         if (spec->beep_amp) {
                 struct snd_kcontrol_new *knew;
                 for (knew = ad_beep_mixer; knew->name; knew++) {
@@ -202,11 +209,12 @@ static int ad198x_build_controls(struct hda_codec *codec)
                         if (!kctl)
                                 return -ENOMEM;
                         kctl->private_value = spec->beep_amp;
-                        err = snd_hda_ctl_add(codec, kctl);
+                        err = snd_hda_ctl_add(codec, 0, kctl);
                         if (err < 0)
                                 return err;
                 }
         }
+#endif
 
         /* if we have no master control, let's create it */
         if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
@@ -230,6 +238,27 @@ static int ad198x_build_controls(struct hda_codec *codec)
         }
 
         ad198x_free_kctls(codec); /* no longer needed */
+
+        /* assign Capture Source enums to NID */
+        kctl = snd_hda_find_mixer_ctl(codec, "Capture Source");
+        if (!kctl)
+                kctl = snd_hda_find_mixer_ctl(codec, "Input Source");
+        for (i = 0; kctl && i < kctl->count; i++) {
+                err = snd_hda_add_nid(codec, kctl, i, spec->capsrc_nids[i]);
+                if (err < 0)
+                        return err;
+        }
+
+        /* assign IEC958 enums to NID */
+        kctl = snd_hda_find_mixer_ctl(codec,
+                        SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source");
+        if (kctl) {
+                err = snd_hda_add_nid(codec, kctl, 0,
+                                      spec->multiout.dig_out_nid);
+                if (err < 0)
+                        return err;
+        }
+
         return 0;
 }
 
@@ -412,6 +441,11 @@ static int ad198x_build_pcms(struct hda_codec *codec)
         return 0;
 }
 
+static inline void ad198x_shutup(struct hda_codec *codec)
+{
+        snd_hda_shutup_pins(codec);
+}
+
 static void ad198x_free_kctls(struct hda_codec *codec)
 {
         struct ad198x_spec *spec = codec->spec;
@@ -425,6 +459,46 @@ static void ad198x_free_kctls(struct hda_codec *codec)
         snd_array_free(&spec->kctls);
 }
 
+static void ad198x_power_eapd_write(struct hda_codec *codec, hda_nid_t front,
+                                hda_nid_t hp)
+{
+        struct ad198x_spec *spec = codec->spec;
+        snd_hda_codec_write(codec, front, 0, AC_VERB_SET_EAPD_BTLENABLE,
+                            !spec->inv_eapd ? 0x00 : 0x02);
+        snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_EAPD_BTLENABLE,
+                            !spec->inv_eapd ? 0x00 : 0x02);
+}
+
+static void ad198x_power_eapd(struct hda_codec *codec)
+{
+        /* We currently only handle front, HP */
+        switch (codec->vendor_id) {
+        case 0x11d41882:
+        case 0x11d4882a:
+        case 0x11d41884:
+        case 0x11d41984:
+        case 0x11d41883:
+        case 0x11d4184a:
+        case 0x11d4194a:
+        case 0x11d4194b:
+                ad198x_power_eapd_write(codec, 0x12, 0x11);
+                break;
+        case 0x11d41981:
+        case 0x11d41983:
+                ad198x_power_eapd_write(codec, 0x05, 0x06);
+                break;
+        case 0x11d41986:
+                ad198x_power_eapd_write(codec, 0x1b, 0x1a);
+                break;
+        case 0x11d41988:
+        case 0x11d4198b:
+        case 0x11d4989a:
+        case 0x11d4989b:
+                ad198x_power_eapd_write(codec, 0x29, 0x22);
+                break;
+        }
+}
+
 static void ad198x_free(struct hda_codec *codec)
 {
         struct ad198x_spec *spec = codec->spec;
@@ -432,11 +506,21 @@ static void ad198x_free(struct hda_codec *codec)
         if (!spec)
                 return;
 
+        ad198x_shutup(codec);
         ad198x_free_kctls(codec);
         kfree(spec);
         snd_hda_detach_beep_device(codec);
 }
 
+#ifdef SND_HDA_NEEDS_RESUME
+static int ad198x_suspend(struct hda_codec *codec, pm_message_t state)
+{
+        ad198x_shutup(codec);
+        ad198x_power_eapd(codec);
+        return 0;
+}
+#endif
+
 static struct hda_codec_ops ad198x_patch_ops = {
         .build_controls = ad198x_build_controls,
         .build_pcms = ad198x_build_pcms,
@@ -445,12 +529,16 @@ static struct hda_codec_ops ad198x_patch_ops = {
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         .check_power_status = ad198x_check_power_status,
 #endif
+#ifdef SND_HDA_NEEDS_RESUME
+        .suspend = ad198x_suspend,
+#endif
+        .reboot_notify = ad198x_shutup,
 };
 
 
 /*
  * EAPD control
- * the private value = nid | (invert << 8)
+ * the private value = nid
  */
 #define ad198x_eapd_info        snd_ctl_boolean_mono_info
 
@@ -459,8 +547,7 @@ static int ad198x_eapd_get(struct snd_kcontrol *kcontrol,
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct ad198x_spec *spec = codec->spec;
-        int invert = (kcontrol->private_value >> 8) & 1;
-        if (invert)
+        if (spec->inv_eapd)
                 ucontrol->value.integer.value[0] = ! spec->cur_eapd;
         else
                 ucontrol->value.integer.value[0] = spec->cur_eapd;
@@ -472,11 +559,10 @@ static int ad198x_eapd_put(struct snd_kcontrol *kcontrol,
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct ad198x_spec *spec = codec->spec;
-        int invert = (kcontrol->private_value >> 8) & 1;
         hda_nid_t nid = kcontrol->private_value & 0xff;
         unsigned int eapd;
         eapd = !!ucontrol->value.integer.value[0];
-        if (invert)
+        if (spec->inv_eapd)
                 eapd = !eapd;
         if (eapd == spec->cur_eapd)
                 return 0;
@@ -694,10 +780,11 @@ static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "External Amplifier",
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x1b,
                 .info = ad198x_eapd_info,
                 .get = ad198x_eapd_get,
                 .put = ad198x_eapd_put,
-                .private_value = 0x1b | (1 << 8), /* port-D, inversed */
+                .private_value = 0x1b, /* port-D */
         },
         { } /* end */
 };
@@ -712,10 +799,10 @@ static struct snd_kcontrol_new ad1986a_laptop_intmic_mixers[] = {
 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);
+        present = snd_hda_jack_detect(codec, 0x1f);
         /* 0 = 0x1f, 2 = 0x1d, 4 = mixed */
         snd_hda_codec_write(codec, 0x0f, 0, AC_VERB_SET_CONNECT_SEL,
-                            (present & AC_PINSENSE_PRESENCE) ? 0 : 2);
+                            present ? 0 : 2);
 }
 
 #define AD1986A_MIC_EVENT               0x36
@@ -754,10 +841,8 @@ static void ad1986a_update_hp(struct hda_codec *codec)
 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);
-        spec->jack_present = !!(present & 0x80000000);
+        spec->jack_present = snd_hda_jack_detect(codec, 0x1a);
         if (spec->inv_jack_detect)
                 spec->jack_present = !spec->jack_present;
         ad1986a_update_hp(codec);
@@ -803,6 +888,7 @@ static struct snd_kcontrol_new ad1986a_automute_master_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = ad1986a_hp_master_sw_put,
@@ -1003,7 +1089,7 @@ static struct snd_pci_quirk ad1986a_cfg_tbl[] = {
         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(0x1179, 0xff40, "Toshiba Satellite L40-10Q", AD1986A_3STACK),
         SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),
         SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),
         SND_PCI_QUIRK(0x144d, 0xc024, "Samsung P50", AD1986A_SAMSUNG_P50),
@@ -1068,6 +1154,7 @@ static int patch_ad1986a(struct hda_codec *codec)
         spec->loopback.amplist = ad1986a_loopbacks;
 #endif
         spec->vmaster_nid = 0x1b;
+        spec->inv_eapd = 1; /* AD1986A has the inverted EAPD implementation */
 
         codec->patch_ops = ad198x_patch_ops;
 
@@ -1180,6 +1267,8 @@ static int patch_ad1986a(struct hda_codec *codec)
          */
         spec->multiout.no_share_stream = 1;
 
+        codec->no_trigger_sense = 1;
+
         return 0;
 }
 
@@ -1365,6 +1454,8 @@ static int patch_ad1983(struct hda_codec *codec)
 
         codec->patch_ops = ad198x_patch_ops;
 
+        codec->no_trigger_sense = 1;
+
         return 0;
 }
 
@@ -1547,8 +1638,7 @@ static void ad1981_hp_automute(struct hda_codec *codec)
 {
         unsigned int present;
 
-        present = snd_hda_codec_read(codec, 0x06, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        present = snd_hda_jack_detect(codec, 0x06);
         snd_hda_codec_amp_stereo(codec, 0x05, HDA_OUTPUT, 0,
                                  HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
 }
@@ -1568,8 +1658,7 @@ static void ad1981_hp_automic(struct hda_codec *codec)
         };
         unsigned int present;
 
-        present = snd_hda_codec_read(codec, 0x08, 0,
-                                 AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        present = snd_hda_jack_detect(codec, 0x08);
         if (present)
                 snd_hda_sequence_write(codec, mic_jack_on);
         else
@@ -1604,6 +1693,7 @@ static struct snd_kcontrol_new ad1981_hp_mixers[] = {
         HDA_BIND_VOL("Master Playback Volume", &ad1981_hp_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x05,
                 .name = "Master Playback Switch",
                 .info = ad198x_eapd_info,
                 .get = ad198x_eapd_get,
@@ -1785,10 +1875,26 @@ static int patch_ad1981(struct hda_codec *codec)
 
                 codec->patch_ops.init = ad1981_hp_init;
                 codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
+                /* set the upper-limit for mixer amp to 0dB for avoiding the
+                 * possible damage by overloading
+                 */
+                snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT,
+                                          (0x17 << AC_AMPCAP_OFFSET_SHIFT) |
+                                          (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |
+                                          (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |
+                                          (1 << AC_AMPCAP_MUTE_SHIFT));
                 break;
         case AD1981_THINKPAD:
                 spec->mixers[0] = ad1981_thinkpad_mixers;
                 spec->input_mux = &ad1981_thinkpad_capture_source;
+                /* set the upper-limit for mixer amp to 0dB for avoiding the
+                 * possible damage by overloading
+                 */
+                snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT,
+                                          (0x17 << AC_AMPCAP_OFFSET_SHIFT) |
+                                          (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |
+                                          (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |
+                                          (1 << AC_AMPCAP_MUTE_SHIFT));
                 break;
         case AD1981_TOSHIBA:
                 spec->mixers[0] = ad1981_hp_mixers;
@@ -1801,6 +1907,9 @@ static int patch_ad1981(struct hda_codec *codec)
                 codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
                 break;
         }
+
+        codec->no_trigger_sense = 1;
+
         return 0;
 }
 
@@ -2117,10 +2226,11 @@ static struct snd_kcontrol_new ad1988_laptop_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "External Amplifier",
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x12,
                 .info = ad198x_eapd_info,
                 .get = ad198x_eapd_get,
                 .put = ad198x_eapd_put,
-                .private_value = 0x12 | (1 << 8), /* port-D, inversed */
+                .private_value = 0x12, /* port-D */
         },
 
         { } /* end */
@@ -2238,6 +2348,7 @@ static struct snd_kcontrol_new ad1988_spdif_out_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "IEC958 Playback Source",
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x1b,
                 .info = ad1988_spdif_playback_source_info,
                 .get = ad1988_spdif_playback_source_get,
                 .put = ad1988_spdif_playback_source_put,
@@ -2353,6 +2464,12 @@ static struct hda_verb ad1988_spdif_init_verbs[] = {
         { }
 };
 
+static struct hda_verb ad1988_spdif_in_init_verbs[] = {
+        /* unmute SPDIF input pin */
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        { }
+};
+
 /* AD1989 has no ADC -> SPDIF route */
 static struct hda_verb ad1989_spdif_init_verbs[] = {
         /* SPDIF-1 out pin */
@@ -2524,7 +2641,7 @@ static void ad1988_laptop_unsol_event(struct hda_codec *codec, unsigned int res)
 {
         if ((res >> 26) != AD1988_HP_EVENT)
                 return;
-        if (snd_hda_codec_read(codec, 0x11, 0, AC_VERB_GET_PIN_SENSE, 0) & (1 << 31))
+        if (snd_hda_jack_detect(codec, 0x11))
                 snd_hda_sequence_write(codec, ad1988_laptop_hp_on);
         else
                 snd_hda_sequence_write(codec, ad1988_laptop_hp_off);
@@ -2569,6 +2686,8 @@ static int add_control(struct ad198x_spec *spec, int type, const char *name,
         knew->name = kstrdup(name, GFP_KERNEL);
         if (! knew->name)
                 return -ENOMEM;
+        if (get_amp_nid_(val))
+                knew->subdevice = HDA_SUBDEV_AMP_FLAG;
         knew->private_value = val;
         return 0;
 }
@@ -3059,6 +3178,7 @@ static int patch_ad1988(struct hda_codec *codec)
                 spec->input_mux = &ad1988_laptop_capture_source;
                 spec->num_mixers = 1;
                 spec->mixers[0] = ad1988_laptop_mixers;
+                spec->inv_eapd = 1; /* inverted EAPD */
                 spec->num_init_verbs = 1;
                 spec->init_verbs[0] = ad1988_laptop_init_verbs;
                 if (board_config == AD1988_LAPTOP_DIG)
@@ -3085,8 +3205,11 @@ static int patch_ad1988(struct hda_codec *codec)
                                 ad1988_spdif_init_verbs;
                 }
         }
-        if (spec->dig_in_nid && codec->vendor_id < 0x11d4989a)
+        if (spec->dig_in_nid && codec->vendor_id < 0x11d4989a) {
                 spec->mixers[spec->num_mixers++] = ad1988_spdif_in_mixers;
+                spec->init_verbs[spec->num_init_verbs++] =
+                        ad1988_spdif_in_init_verbs;
+        }
 
         codec->patch_ops = ad198x_patch_ops;
         switch (board_config) {
@@ -3103,6 +3226,8 @@ static int patch_ad1988(struct hda_codec *codec)
 #endif
         spec->vmaster_nid = 0x04;
 
+        codec->no_trigger_sense = 1;
+
         return 0;
 }
 
@@ -3315,6 +3440,8 @@ static int patch_ad1884(struct hda_codec *codec)
 
         codec->patch_ops = ad198x_patch_ops;
 
+        codec->no_trigger_sense = 1;
+
         return 0;
 }
 
@@ -3721,6 +3848,7 @@ static struct snd_kcontrol_new ad1884a_laptop_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = ad1884a_mobile_master_sw_put,
@@ -3749,6 +3877,7 @@ static struct snd_kcontrol_new ad1884a_mobile_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = ad1884a_mobile_master_sw_put,
@@ -3768,8 +3897,7 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x11);
         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,
@@ -3781,8 +3909,7 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x14);
         snd_hda_codec_write(codec, 0x0c, 0, AC_VERB_SET_CONNECT_SEL,
                             present ? 0 : 1);
 }
@@ -3817,13 +3944,9 @@ static void ad1884a_laptop_automute(struct hda_codec *codec)
 {
         unsigned int present;
 
-        present = snd_hda_codec_read(codec, 0x11, 0, AC_VERB_GET_PIN_SENSE, 0);
-        present &= AC_PINSENSE_PRESENCE;
-        if (!present) {
-                present = snd_hda_codec_read(codec, 0x12, 0,
-                                             AC_VERB_GET_PIN_SENSE, 0);
-                present &= AC_PINSENSE_PRESENCE;
-        }
+        present = snd_hda_jack_detect(codec, 0x11);
+        if (!present)
+                present = snd_hda_jack_detect(codec, 0x12);
         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,
@@ -3835,11 +3958,9 @@ static void ad1884a_laptop_automic(struct hda_codec *codec)
 {
         unsigned int idx;
 
-        if (snd_hda_codec_read(codec, 0x14, 0, AC_VERB_GET_PIN_SENSE, 0) &
-            AC_PINSENSE_PRESENCE)
+        if (snd_hda_jack_detect(codec, 0x14))
                 idx = 0;
-        else if (snd_hda_codec_read(codec, 0x1c, 0, AC_VERB_GET_PIN_SENSE, 0) &
-                 AC_PINSENSE_PRESENCE)
+        else if (snd_hda_jack_detect(codec, 0x1c))
                 idx = 4;
         else
                 idx = 1;
@@ -4008,8 +4129,7 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x11);
         snd_hda_codec_amp_stereo(codec, 0x12, HDA_OUTPUT, 0,
                                  HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
 }
@@ -4099,6 +4219,7 @@ static struct snd_kcontrol_new ad1984a_touchsmart_mixers[] = {
 /*      HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .name = "Master Playback Switch",
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
@@ -4117,14 +4238,12 @@ static struct snd_kcontrol_new ad1984a_touchsmart_mixers[] = {
 /* switch to external mic if plugged */
 static void ad1984a_touchsmart_automic(struct hda_codec *codec)
 {
-        if (snd_hda_codec_read(codec, 0x1c, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000) {
+        if (snd_hda_jack_detect(codec, 0x1c))
                 snd_hda_codec_write(codec, 0x0c, 0,
                                      AC_VERB_SET_CONNECT_SEL, 0x4);
-        } else {
+        else
                 snd_hda_codec_write(codec, 0x0c, 0,
                                      AC_VERB_SET_CONNECT_SEL, 0x5);
-        }
 }
 
 
@@ -4283,6 +4402,8 @@ static int patch_ad1884a(struct hda_codec *codec)
                 break;
         }
 
+        codec->no_trigger_sense = 1;
+
         return 0;
 }
 
@@ -4619,6 +4740,9 @@ static int patch_ad1882(struct hda_codec *codec)
                 spec->mixers[2] = ad1882_6stack_mixers;
                 break;
         }
+
+        codec->no_trigger_sense = 1;
+
         return 0;
 }
 
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c
index d08353d3bb7f..af478019088e 100644
--- a/sound/pci/hda/patch_ca0110.c
+++ b/sound/pci/hda/patch_ca0110.c
@@ -144,7 +144,7 @@ static int _add_switch(struct hda_codec *codec, hda_nid_t nid, const char *pfx,
         struct snd_kcontrol_new knew =
                 HDA_CODEC_MUTE_MONO(namestr, nid, chan, 0, type);
         sprintf(namestr, "%s %s Switch", pfx, dirstr[dir]);
-        return snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
+        return snd_hda_ctl_add(codec, nid, snd_ctl_new1(&knew, codec));
 }
 
 static int _add_volume(struct hda_codec *codec, hda_nid_t nid, const char *pfx,
@@ -155,7 +155,7 @@ static int _add_volume(struct hda_codec *codec, hda_nid_t nid, const char *pfx,
         struct snd_kcontrol_new knew =
                 HDA_CODEC_VOLUME_MONO(namestr, nid, chan, 0, type);
         sprintf(namestr, "%s %s Volume", pfx, dirstr[dir]);
-        return snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
+        return snd_hda_ctl_add(codec, nid, snd_ctl_new1(&knew, codec));
 }
 
 #define add_out_switch(codec, nid, pfx) _add_switch(codec, nid, pfx, 3, 0)
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 8ba306856d38..350ee8ac4153 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -66,6 +66,7 @@ struct cs_spec {
 /* available models */
 enum {
         CS420X_MBP55,
+        CS420X_IMAC27,
         CS420X_AUTO,
         CS420X_MODELS
 };
@@ -500,7 +501,8 @@ static int add_mute(struct hda_codec *codec, const char *name, int index,
         knew.private_value = pval;
         snprintf(tmp, sizeof(tmp), "%s %s Switch", name, dir_sfx[dir]);
         *kctlp = snd_ctl_new1(&knew, codec);
-        return snd_hda_ctl_add(codec, *kctlp);
+        (*kctlp)->id.subdevice = HDA_SUBDEV_AMP_FLAG;
+        return snd_hda_ctl_add(codec, 0, *kctlp);
 }
 
 static int add_volume(struct hda_codec *codec, const char *name,
@@ -513,7 +515,8 @@ static int add_volume(struct hda_codec *codec, const char *name,
         knew.private_value = pval;
         snprintf(tmp, sizeof(tmp), "%s %s Volume", name, dir_sfx[dir]);
         *kctlp = snd_ctl_new1(&knew, codec);
-        return snd_hda_ctl_add(codec, *kctlp);
+        (*kctlp)->id.subdevice = HDA_SUBDEV_AMP_FLAG;
+        return snd_hda_ctl_add(codec, 0, *kctlp);
 }
 
 static void fix_volume_caps(struct hda_codec *codec, hda_nid_t dac)
@@ -536,14 +539,14 @@ static int add_vmaster(struct hda_codec *codec, hda_nid_t dac)
 
         spec->vmaster_sw =
                 snd_ctl_make_virtual_master("Master Playback Switch", NULL);
-        err = snd_hda_ctl_add(codec, spec->vmaster_sw);
+        err = snd_hda_ctl_add(codec, dac, spec->vmaster_sw);
         if (err < 0)
                 return err;
 
         snd_hda_set_vmaster_tlv(codec, dac, HDA_OUTPUT, tlv);
         spec->vmaster_vol =
                 snd_ctl_make_virtual_master("Master Playback Volume", tlv);
-        err = snd_hda_ctl_add(codec, spec->vmaster_vol);
+        err = snd_hda_ctl_add(codec, dac, spec->vmaster_vol);
         if (err < 0)
                 return err;
         return 0;
@@ -750,19 +753,27 @@ static int build_input(struct hda_codec *codec)
         spec->capture_bind[1] = make_bind_capture(codec, &snd_hda_bind_vol);
         for (i = 0; i < 2; i++) {
                 struct snd_kcontrol *kctl;
+                int n;
                 if (!spec->capture_bind[i])
                         return -ENOMEM;
                 kctl = snd_ctl_new1(&cs_capture_ctls[i], codec);
                 if (!kctl)
                         return -ENOMEM;
                 kctl->private_value = (long)spec->capture_bind[i];
-                err = snd_hda_ctl_add(codec, kctl);
+                err = snd_hda_ctl_add(codec, 0, kctl);
                 if (err < 0)
                         return err;
+                for (n = 0; n < AUTO_PIN_LAST; n++) {
+                        if (!spec->adc_nid[n])
+                                continue;
+                        err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[n]);
+                        if (err < 0)
+                                return err;
+                }
         }
         
         if (spec->num_inputs > 1 && !spec->mic_detect) {
-                err = snd_hda_ctl_add(codec,
+                err = snd_hda_ctl_add(codec, 0,
                                       snd_ctl_new1(&cs_capture_source, codec));
                 if (err < 0)
                         return err;
@@ -807,7 +818,7 @@ static void cs_automute(struct hda_codec *codec)
 {
         struct cs_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
-        unsigned int caps, present, hp_present;
+        unsigned int caps, hp_present;
         hda_nid_t nid;
         int i;
 
@@ -817,12 +828,7 @@ static void cs_automute(struct hda_codec *codec)
                 caps = snd_hda_query_pin_caps(codec, nid);
                 if (!(caps & AC_PINCAP_PRES_DETECT))
                         continue;
-                if (caps & AC_PINCAP_TRIG_REQ)
-                        snd_hda_codec_read(codec, nid, 0,
-                                           AC_VERB_SET_PIN_SENSE, 0);
-                present = snd_hda_codec_read(codec, nid, 0,
-                                             AC_VERB_GET_PIN_SENSE, 0);
-                hp_present |= (present & AC_PINSENSE_PRESENCE) != 0;
+                hp_present = snd_hda_jack_detect(codec, nid);
                 if (hp_present)
                         break;
         }
@@ -832,7 +838,8 @@ static void cs_automute(struct hda_codec *codec)
                                     AC_VERB_SET_PIN_WIDGET_CONTROL,
                                     hp_present ? 0 : PIN_OUT);
         }
-        if (spec->board_config == CS420X_MBP55) {
+        if (spec->board_config == CS420X_MBP55 ||
+            spec->board_config == CS420X_IMAC27) {
                 unsigned int gpio = hp_present ? 0x02 : 0x08;
                 snd_hda_codec_write(codec, 0x01, 0,
                                     AC_VERB_SET_GPIO_DATA, gpio);
@@ -844,15 +851,11 @@ static void cs_automic(struct hda_codec *codec)
         struct cs_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
         hda_nid_t nid;
-        unsigned int caps, present;
+        unsigned int present;
         
         nid = cfg->input_pins[spec->automic_idx];
-        caps = snd_hda_query_pin_caps(codec, nid);
-        if (caps & AC_PINCAP_TRIG_REQ)
-                snd_hda_codec_read(codec, nid, 0, AC_VERB_SET_PIN_SENSE, 0);
-        present = snd_hda_codec_read(codec, nid, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0);
-        if (present & AC_PINSENSE_PRESENCE)
+        present = snd_hda_jack_detect(codec, nid);
+        if (present)
                 change_cur_input(codec, spec->automic_idx, 0);
         else {
                 unsigned int imic = (spec->automic_idx == AUTO_PIN_MIC) ?
@@ -947,7 +950,7 @@ static void init_input(struct hda_codec *codec)
                 coef |= 0x0500; /* DMIC2 enable 2 channels, disable GPIO1 */
         if (is_active_pin(codec, CS_DMIC1_PIN_NID))
                 coef |= 0x1800; /* DMIC1 enable 2 channels, disable GPIO0 
-                                 * No effect if SPDIF_OUT2 is slected in 
+                                 * No effect if SPDIF_OUT2 is selected in 
                                  * IDX_SPDIF_CTL.
                                   */
         cs_vendor_coef_set(codec, IDX_ADC_CFG, coef);
@@ -1078,12 +1081,14 @@ static int cs_parse_auto_config(struct hda_codec *codec)
 
 static const char *cs420x_models[CS420X_MODELS] = {
         [CS420X_MBP55] = "mbp55",
+        [CS420X_IMAC27] = "imac27",
         [CS420X_AUTO] = "auto",
 };
 
 
 static struct snd_pci_quirk cs420x_cfg_tbl[] = {
         SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
+        SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
         {} /* terminator */
 };
 
@@ -1106,8 +1111,23 @@ static struct cs_pincfg mbp55_pincfgs[] = {
         {} /* terminator */
 };
 
+static struct cs_pincfg imac27_pincfgs[] = {
+        { 0x09, 0x012b4050 },
+        { 0x0a, 0x90100140 },
+        { 0x0b, 0x90100142 },
+        { 0x0c, 0x018b3020 },
+        { 0x0d, 0x90a00110 },
+        { 0x0e, 0x400000f0 },
+        { 0x0f, 0x01cbe030 },
+        { 0x10, 0x014be060 },
+        { 0x12, 0x01ab9070 },
+        { 0x15, 0x400000f0 },
+        {} /* terminator */
+};
+
 static struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = {
         [CS420X_MBP55] = mbp55_pincfgs,
+        [CS420X_IMAC27] = imac27_pincfgs,
 };
 
 static void fix_pincfg(struct hda_codec *codec, int model)
@@ -1137,6 +1157,7 @@ static int patch_cs420x(struct hda_codec *codec)
                 fix_pincfg(codec, spec->board_config);
 
         switch (spec->board_config) {
+        case CS420X_IMAC27:
         case CS420X_MBP55:
                 /* GPIO1 = headphones */
                 /* GPIO3 = speakers */
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
index 780e1a72114a..ff60908f4554 100644
--- a/sound/pci/hda/patch_cmedia.c
+++ b/sound/pci/hda/patch_cmedia.c
@@ -66,7 +66,7 @@ struct cmi_spec {
 
         struct hda_pcm pcm_rec[2];      /* PCM information */
 
-        /* pin deafault configuration */
+        /* pin default configuration */
         hda_nid_t pin_nid[NUM_PINS];
         unsigned int def_conf[NUM_PINS];
         unsigned int pin_def_confs;
@@ -197,8 +197,8 @@ static struct snd_kcontrol_new cmi9880_basic_mixer[] = {
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x08, 0, HDA_INPUT),
         HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x23, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x23, 0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Beep Playback Volume", 0x23, 0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Beep Playback Switch", 0x23, 0, HDA_OUTPUT),
         { } /* end */
 };
 
@@ -315,7 +315,8 @@ static struct hda_verb cmi9880_allout_init[] = {
 static int cmi9880_build_controls(struct hda_codec *codec)
 {
         struct cmi_spec *spec = codec->spec;
-        int err;
+        struct snd_kcontrol *kctl;
+        int i, err;
 
         err = snd_hda_add_new_ctls(codec, cmi9880_basic_mixer);
         if (err < 0)
@@ -340,6 +341,14 @@ static int cmi9880_build_controls(struct hda_codec *codec)
                 if (err < 0)
                         return err;
         }
+
+        /* assign Capture Source enums to NID */
+        kctl = snd_hda_find_mixer_ctl(codec, "Capture Source");
+        for (i = 0; kctl && i < kctl->count; i++) {
+                err = snd_hda_add_nid(codec, kctl, i, spec->adc_nids[i]);
+                if (err < 0)
+                        return err;
+        }
         return 0;
 }
 
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 905859d4f4df..feabb44c7ca4 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -29,6 +29,7 @@
 
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_beep.h"
 
 #define CXT_PIN_DIR_IN              0x00
 #define CXT_PIN_DIR_OUT             0x01
@@ -41,10 +42,12 @@
 
 /* Conexant 5051 specific */
 
-#define CXT5051_SPDIF_OUT       0x1C
+#define CXT5051_SPDIF_OUT       0x12
 #define CXT5051_PORTB_EVENT     0x38
 #define CXT5051_PORTC_EVENT     0x39
 
+#define AUTO_MIC_PORTB          (1 << 1)
+#define AUTO_MIC_PORTC          (1 << 2)
 
 struct conexant_jack {
 
@@ -73,7 +76,7 @@ struct conexant_spec {
                                          */
         unsigned int cur_eapd;
         unsigned int hp_present;
-        unsigned int no_auto_mic;
+        unsigned int auto_mic;
         unsigned int need_dac_fix;
 
         /* capture */
@@ -110,7 +113,23 @@ struct conexant_spec {
 
         unsigned int dell_automute;
         unsigned int port_d_mode;
-        unsigned char ext_mic_bias;
+        unsigned int dell_vostro:1;
+        unsigned int ideapad:1;
+
+        unsigned int ext_mic_present;
+        unsigned int recording;
+        void (*capture_prepare)(struct hda_codec *codec);
+        void (*capture_cleanup)(struct hda_codec *codec);
+
+        /* OLPC XO-1.5 supports DC input mode (e.g. for use with analog sensors)
+         * through the microphone jack.
+         * When the user enables this through a mixer switch, both internal and
+         * external microphones are disabled. Gain is fixed at 0dB. In this mode,
+         * we also allow the bias to be configured through a separate mixer
+         * control. */
+        unsigned int dc_enable;
+        unsigned int dc_input_bias; /* offset into cxt5066_olpc_dc_bias */
+        unsigned int mic_boost; /* offset into cxt5066_analog_mic_boost */
 };
 
 static int conexant_playback_pcm_open(struct hda_pcm_stream *hinfo,
@@ -183,6 +202,8 @@ static int conexant_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
                                       struct snd_pcm_substream *substream)
 {
         struct conexant_spec *spec = codec->spec;
+        if (spec->capture_prepare)
+                spec->capture_prepare(codec);
         snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
                                    stream_tag, 0, format);
         return 0;
@@ -194,6 +215,8 @@ static int conexant_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
 {
         struct conexant_spec *spec = codec->spec;
         snd_hda_codec_cleanup_stream(codec, spec->adc_nids[substream->number]);
+        if (spec->capture_cleanup)
+                spec->capture_cleanup(codec);
         return 0;
 }
 
@@ -397,9 +420,7 @@ static void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)
                 for (i = 0; i < spec->jacks.used; i++) {
                         if (jacks->nid == nid) {
                                 unsigned int present;
-                                present = snd_hda_codec_read(codec, nid, 0,
-                                                AC_VERB_GET_PIN_SENSE, 0) &
-                                        AC_PINSENSE_PRESENCE;
+                                present = snd_hda_jack_detect(codec, nid);
 
                                 present = (present) ? jacks->type : 0 ;
 
@@ -478,6 +499,7 @@ static void conexant_free(struct hda_codec *codec)
                 snd_array_free(&spec->jacks);
         }
 #endif
+        snd_hda_detach_beep_device(codec);
         kfree(codec->spec);
 }
 
@@ -750,8 +772,7 @@ static void cxt5045_hp_automic(struct hda_codec *codec)
         };
         unsigned int present;
 
-        present = snd_hda_codec_read(codec, 0x12, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        present = snd_hda_jack_detect(codec, 0x12);
         if (present)
                 snd_hda_sequence_write(codec, mic_jack_on);
         else
@@ -765,8 +786,7 @@ static void cxt5045_hp_automute(struct hda_codec *codec)
         struct conexant_spec *spec = codec->spec;
         unsigned int bits;
 
-        spec->hp_present = snd_hda_codec_read(codec, 0x11, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        spec->hp_present = snd_hda_jack_detect(codec, 0x11);
 
         bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0; 
         snd_hda_codec_amp_stereo(codec, 0x10, HDA_OUTPUT, 0,
@@ -1175,9 +1195,12 @@ static int patch_cxt5045(struct hda_codec *codec)
 
         switch (codec->subsystem_id >> 16) {
         case 0x103c:
-                /* HP laptop has a really bad sound over 0dB on NID 0x17.
-                 * Fix max PCM level to 0 dB
-                 * (originall it has 0x2b steps with 0dB offset 0x14)
+        case 0x1631:
+        case 0x1734:
+        case 0x17aa:
+                /* HP, Packard Bell, Fujitsu-Siemens & Lenovo laptops have
+                 * really bad sound over 0dB on NID 0x17. Fix max PCM level to
+                 * 0 dB (originally it has 0x2b steps with 0dB offset 0x14)
                  */
                 snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,
                                           (0x14 << AC_AMPCAP_OFFSET_SHIFT) |
@@ -1243,8 +1266,7 @@ static void cxt5047_hp_automute(struct hda_codec *codec)
         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;
+        spec->hp_present = snd_hda_jack_detect(codec, 0x13);
 
         bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0;
         /* See the note in cxt5047_hp_master_sw_put */
@@ -1267,8 +1289,7 @@ static void cxt5047_hp_automic(struct hda_codec *codec)
         };
         unsigned int present;
 
-        present = snd_hda_codec_read(codec, 0x15, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        present = snd_hda_jack_detect(codec, 0x15);
         if (present)
                 snd_hda_sequence_write(codec, mic_jack_on);
         else
@@ -1415,16 +1436,7 @@ static struct snd_kcontrol_new cxt5047_test_mixer[] = {
                 .get = conexant_mux_enum_get,
                 .put = conexant_mux_enum_put,
         },
-        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),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x1a, 0x0, HDA_OUTPUT),
 
         { } /* end */
 };
@@ -1581,6 +1593,21 @@ static int patch_cxt5047(struct hda_codec *codec)
 #endif  
         }
         spec->vmaster_nid = 0x13;
+
+        switch (codec->subsystem_id >> 16) {
+        case 0x103c:
+                /* HP laptops have really bad sound over 0 dB on NID 0x10.
+                 * Fix max PCM level to 0 dB (originally it has 0x1e steps
+                 * with 0 dB offset 0x17)
+                 */
+                snd_hda_override_amp_caps(codec, 0x10, HDA_INPUT,
+                                          (0x17 << AC_AMPCAP_OFFSET_SHIFT) |
+                                          (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |
+                                          (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |
+                                          (1 << AC_AMPCAP_MUTE_SHIFT));
+                break;
+        }
+
         return 0;
 }
 
@@ -1596,6 +1623,11 @@ static void cxt5051_update_speaker(struct hda_codec *codec)
 {
         struct conexant_spec *spec = codec->spec;
         unsigned int pinctl;
+        /* headphone pin */
+        pinctl = (spec->hp_present && spec->cur_eapd) ? PIN_HP : 0;
+        snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                            pinctl);
+        /* speaker pin */
         pinctl = (!spec->hp_present && spec->cur_eapd) ? PIN_OUT : 0;
         snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
                             pinctl);
@@ -1619,11 +1651,9 @@ static void cxt5051_portb_automic(struct hda_codec *codec)
         struct conexant_spec *spec = codec->spec;
         unsigned int present;
 
-        if (spec->no_auto_mic)
+        if (!(spec->auto_mic & AUTO_MIC_PORTB))
                 return;
-        present = snd_hda_codec_read(codec, 0x17, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) &
-                AC_PINSENSE_PRESENCE;
+        present = snd_hda_jack_detect(codec, 0x17);
         snd_hda_codec_write(codec, 0x14, 0,
                             AC_VERB_SET_CONNECT_SEL,
                             present ? 0x01 : 0x00);
@@ -1636,11 +1666,9 @@ static void cxt5051_portc_automic(struct hda_codec *codec)
         unsigned int present;
         hda_nid_t new_adc;
 
-        if (spec->no_auto_mic)
+        if (!(spec->auto_mic & AUTO_MIC_PORTC))
                 return;
-        present = snd_hda_codec_read(codec, 0x18, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) &
-                AC_PINSENSE_PRESENCE;
+        present = snd_hda_jack_detect(codec, 0x18);
         if (present)
                 spec->cur_adc_idx = 1;
         else
@@ -1661,9 +1689,7 @@ 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;
+        spec->hp_present = snd_hda_jack_detect(codec, 0x16);
         cxt5051_update_speaker(codec);
 }
 
@@ -1686,13 +1712,7 @@ static void cxt5051_hp_unsol_event(struct hda_codec *codec,
         conexant_report_jack(codec, nid);
 }
 
-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),
+static struct snd_kcontrol_new cxt5051_playback_mixers[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1702,7 +1722,16 @@ static struct snd_kcontrol_new cxt5051_mixers[] = {
                 .put = cxt5051_hp_master_sw_put,
                 .private_value = 0x1a,
         },
+        {}
+};
 
+static struct snd_kcontrol_new cxt5051_capture_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),
         {}
 };
 
@@ -1711,32 +1740,26 @@ static struct snd_kcontrol_new cxt5051_hp_mixers[] = {
         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 snd_kcontrol_new cxt5051_hp_dv6736_mixers[] = {
-        HDA_CODEC_VOLUME("Mic Volume", 0x14, 0x00, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Switch", 0x14, 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,
-        },
+        HDA_CODEC_VOLUME("Capture Volume", 0x14, 0x00, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x14, 0x00, HDA_INPUT),
+        {}
+};
 
+static struct snd_kcontrol_new cxt5051_f700_mixers[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x14, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x14, 0x01, HDA_INPUT),
+        {}
+};
+
+static struct snd_kcontrol_new cxt5051_toshiba_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),
         {}
 };
 
@@ -1765,8 +1788,6 @@ static struct hda_verb cxt5051_init_verbs[] = {
         /* 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 */
 };
 
@@ -1792,7 +1813,6 @@ static struct hda_verb cxt5051_hp_dv6736_init_verbs[] = {
         /* 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},
         { } /* end */
 };
 
@@ -1824,17 +1844,60 @@ static struct hda_verb cxt5051_lenovo_x200_init_verbs[] = {
         /* 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},
         {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},
         { } /* end */
 };
 
+static struct hda_verb cxt5051_f700_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_PIN_WIDGET_CONTROL, 0x0},
+        {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0},
+        /* 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(1) | 0x44},
+        {0x14, AC_VERB_SET_CONNECT_SEL, 0x1},
+        /* 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},
+        { } /* end */
+};
+
+static void cxt5051_init_mic_port(struct hda_codec *codec, hda_nid_t nid,
+                                 unsigned int event)
+{
+        snd_hda_codec_write(codec, nid, 0,
+                            AC_VERB_SET_UNSOLICITED_ENABLE,
+                            AC_USRSP_EN | event);
+#ifdef CONFIG_SND_HDA_INPUT_JACK
+        conexant_add_jack(codec, nid, SND_JACK_MICROPHONE);
+        conexant_report_jack(codec, nid);
+#endif
+}
+
 /* initialize jack-sensing, too */
 static int cxt5051_init(struct hda_codec *codec)
 {
+        struct conexant_spec *spec = codec->spec;
+
         conexant_init(codec);
         conexant_init_jacks(codec);
+
+        if (spec->auto_mic & AUTO_MIC_PORTB)
+                cxt5051_init_mic_port(codec, 0x17, CXT5051_PORTB_EVENT);
+        if (spec->auto_mic & AUTO_MIC_PORTC)
+                cxt5051_init_mic_port(codec, 0x18, CXT5051_PORTC_EVENT);
+
         if (codec->patch_ops.unsol_event) {
                 cxt5051_hp_automute(codec);
                 cxt5051_portb_automic(codec);
@@ -1849,6 +1912,8 @@ enum {
         CXT5051_HP,     /* no docking */
         CXT5051_HP_DV6736,      /* HP without mic switch */
         CXT5051_LENOVO_X200,    /* Lenovo X200 laptop */
+        CXT5051_F700,       /* HP Compaq Presario F700 */
+        CXT5051_TOSHIBA,        /* Toshiba M300 & co */
         CXT5051_MODELS
 };
 
@@ -1857,11 +1922,15 @@ static const char *cxt5051_models[CXT5051_MODELS] = {
         [CXT5051_HP]            = "hp",
         [CXT5051_HP_DV6736]     = "hp-dv6736",
         [CXT5051_LENOVO_X200]   = "lenovo-x200",
+        [CXT5051_F700]          = "hp-700",
+        [CXT5051_TOSHIBA]       = "toshiba",
 };
 
 static struct snd_pci_quirk cxt5051_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6736", CXT5051_HP_DV6736),
         SND_PCI_QUIRK(0x103c, 0x360b, "Compaq Presario CQ60", CXT5051_HP),
+        SND_PCI_QUIRK(0x103c, 0x30ea, "Compaq Presario F700", CXT5051_F700),
+        SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba M30x", CXT5051_TOSHIBA),
         SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",
                       CXT5051_LAPTOP),
         SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP),
@@ -1889,8 +1958,9 @@ static int patch_cxt5051(struct hda_codec *codec)
         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_mixers = 2;
+        spec->mixers[0] = cxt5051_capture_mixers;
+        spec->mixers[1] = cxt5051_playback_mixers;
         spec->num_init_verbs = 1;
         spec->init_verbs[0] = cxt5051_init_verbs;
         spec->spdif_route = 0;
@@ -1904,6 +1974,7 @@ static int patch_cxt5051(struct hda_codec *codec)
         board_config = snd_hda_check_board_config(codec, CXT5051_MODELS,
                                                   cxt5051_models,
                                                   cxt5051_cfg_tbl);
+        spec->auto_mic = AUTO_MIC_PORTB | AUTO_MIC_PORTC;
         switch (board_config) {
         case CXT5051_HP:
                 spec->mixers[0] = cxt5051_hp_mixers;
@@ -1911,11 +1982,20 @@ static int patch_cxt5051(struct hda_codec *codec)
         case CXT5051_HP_DV6736:
                 spec->init_verbs[0] = cxt5051_hp_dv6736_init_verbs;
                 spec->mixers[0] = cxt5051_hp_dv6736_mixers;
-                spec->no_auto_mic = 1;
+                spec->auto_mic = 0;
                 break;
         case CXT5051_LENOVO_X200:
                 spec->init_verbs[0] = cxt5051_lenovo_x200_init_verbs;
                 break;
+        case CXT5051_F700:
+                spec->init_verbs[0] = cxt5051_f700_init_verbs;
+                spec->mixers[0] = cxt5051_f700_mixers;
+                spec->auto_mic = 0;
+                break;
+        case CXT5051_TOSHIBA:
+                spec->mixers[0] = cxt5051_toshiba_mixers;
+                spec->auto_mic = AUTO_MIC_PORTB;
+                break;
         }
 
         return 0;
@@ -1983,36 +2063,147 @@ static int cxt5066_hp_master_sw_put(struct snd_kcontrol *kcontrol,
         return 1;
 }
 
+static const struct hda_input_mux cxt5066_olpc_dc_bias = {
+        .num_items = 3,
+        .items = {
+                { "Off", PIN_IN },
+                { "50%", PIN_VREF50 },
+                { "80%", PIN_VREF80 },
+        },
+};
+
+static int cxt5066_set_olpc_dc_bias(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        /* Even though port F is the DC input, the bias is controlled on port B.
+         * we also leave that port as an active input (but unselected) in DC mode
+         * just in case that is necessary to make the bias setting take effect. */
+        return snd_hda_codec_write_cache(codec, 0x1a, 0,
+                AC_VERB_SET_PIN_WIDGET_CONTROL,
+                cxt5066_olpc_dc_bias.items[spec->dc_input_bias].index);
+}
+
+/* OLPC defers mic widget control until when capture is started because the
+ * microphone LED comes on as soon as these settings are put in place. if we
+ * did this before recording, it would give the false indication that recording
+ * is happening when it is not. */
+static void cxt5066_olpc_select_mic(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        if (!spec->recording)
+                return;
+
+        if (spec->dc_enable) {
+                /* in DC mode we ignore presence detection and just use the jack
+                 * through our special DC port */
+                const struct hda_verb enable_dc_mode[] = {
+                        /* disble internal mic, port C */
+                        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+
+                        /* enable DC capture, port F */
+                        {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+                        {},
+                };
+
+                snd_hda_sequence_write(codec, enable_dc_mode);
+                /* port B input disabled (and bias set) through the following call */
+                cxt5066_set_olpc_dc_bias(codec);
+                return;
+        }
+
+        /* disable DC (port F) */
+        snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
+
+        /* external mic, port B */
+        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                spec->ext_mic_present ? CXT5066_OLPC_EXT_MIC_BIAS : 0);
+
+        /* internal mic, port C */
+        snd_hda_codec_write(codec, 0x1b, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                spec->ext_mic_present ? 0 : PIN_VREF80);
+}
+
 /* toggle input of built-in and mic jack appropriately */
-static void cxt5066_automic(struct hda_codec *codec)
+static void cxt5066_olpc_automic(struct hda_codec *codec)
 {
         struct conexant_spec *spec = codec->spec;
+        unsigned int present;
+
+        if (spec->dc_enable) /* don't do presence detection in DC mode */
+                return;
+
+        present = snd_hda_codec_read(codec, 0x1a, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        if (present)
+                snd_printdd("CXT5066: external microphone detected\n");
+        else
+                snd_printdd("CXT5066: external microphone absent\n");
+
+        snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_CONNECT_SEL,
+                present ? 0 : 1);
+        spec->ext_mic_present = !!present;
+
+        cxt5066_olpc_select_mic(codec);
+}
+
+/* toggle input of built-in digital mic and mic jack appropriately */
+static void cxt5066_vostro_automic(struct hda_codec *codec)
+{
+        unsigned int present;
+
         struct hda_verb ext_mic_present[] = {
                 /* enable external mic, port B */
-                {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, spec->ext_mic_bias},
+                {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
 
                 /* switch to external mic input */
                 {0x17, AC_VERB_SET_CONNECT_SEL, 0},
+                {0x14, AC_VERB_SET_CONNECT_SEL, 0},
 
-                /* disable internal mic, port C */
-                {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+                /* disable internal digital mic */
+                {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
                 {}
         };
         static struct hda_verb ext_mic_absent[] = {
                 /* enable internal mic, port C */
-                {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+                {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
 
                 /* switch to internal mic input */
-                {0x17, AC_VERB_SET_CONNECT_SEL, 1},
+                {0x14, AC_VERB_SET_CONNECT_SEL, 2},
 
                 /* disable external mic, port B */
                 {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
                 {}
         };
+
+        present = snd_hda_jack_detect(codec, 0x1a);
+        if (present) {
+                snd_printdd("CXT5066: external microphone detected\n");
+                snd_hda_sequence_write(codec, ext_mic_present);
+        } else {
+                snd_printdd("CXT5066: external microphone absent\n");
+                snd_hda_sequence_write(codec, ext_mic_absent);
+        }
+}
+
+/* toggle input of built-in digital mic and mic jack appropriately */
+static void cxt5066_ideapad_automic(struct hda_codec *codec)
+{
         unsigned int present;
 
-        present = snd_hda_codec_read(codec, 0x1a, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        struct hda_verb ext_mic_present[] = {
+                {0x14, AC_VERB_SET_CONNECT_SEL, 0},
+                {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+                {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+                {}
+        };
+        static struct hda_verb ext_mic_absent[] = {
+                {0x14, AC_VERB_SET_CONNECT_SEL, 2},
+                {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+                {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+                {}
+        };
+
+        present = snd_hda_jack_detect(codec, 0x1b);
         if (present) {
                 snd_printdd("CXT5066: external microphone detected\n");
                 snd_hda_sequence_write(codec, ext_mic_present);
@@ -2029,12 +2220,10 @@ static void cxt5066_hp_automute(struct hda_codec *codec)
         unsigned int portA, portD;
 
         /* Port A */
-        portA = snd_hda_codec_read(codec, 0x19, 0, AC_VERB_GET_PIN_SENSE, 0)
-                & AC_PINSENSE_PRESENCE;
+        portA = snd_hda_jack_detect(codec, 0x19);
 
         /* Port D */
-        portD = (snd_hda_codec_read(codec, 0x1c, 0, AC_VERB_GET_PIN_SENSE, 0)
-                & AC_PINSENSE_PRESENCE) << 1;
+        portD = snd_hda_jack_detect(codec, 0x1c);
 
         spec->hp_present = !!(portA | portD);
         snd_printdd("CXT5066: hp automute portA=%x portD=%x present=%d\n",
@@ -2043,15 +2232,46 @@ static void cxt5066_hp_automute(struct hda_codec *codec)
 }
 
 /* unsolicited event for jack sensing */
-static void cxt5066_unsol_event(struct hda_codec *codec, unsigned int res)
+static void cxt5066_olpc_unsol_event(struct hda_codec *codec, unsigned int res)
 {
+        struct conexant_spec *spec = codec->spec;
         snd_printdd("CXT5066: unsol event %x (%x)\n", res, res >> 26);
         switch (res >> 26) {
         case CONEXANT_HP_EVENT:
                 cxt5066_hp_automute(codec);
                 break;
         case CONEXANT_MIC_EVENT:
-                cxt5066_automic(codec);
+                /* ignore mic events in DC mode; we're always using the jack */
+                if (!spec->dc_enable)
+                        cxt5066_olpc_automic(codec);
+                break;
+        }
+}
+
+/* unsolicited event for jack sensing */
+static void cxt5066_vostro_event(struct hda_codec *codec, unsigned int res)
+{
+        snd_printdd("CXT5066_vostro: unsol event %x (%x)\n", res, res >> 26);
+        switch (res >> 26) {
+        case CONEXANT_HP_EVENT:
+                cxt5066_hp_automute(codec);
+                break;
+        case CONEXANT_MIC_EVENT:
+                cxt5066_vostro_automic(codec);
+                break;
+        }
+}
+
+/* unsolicited event for jack sensing */
+static void cxt5066_ideapad_event(struct hda_codec *codec, unsigned int res)
+{
+        snd_printdd("CXT5066_ideapad: unsol event %x (%x)\n", res, res >> 26);
+        switch (res >> 26) {
+        case CONEXANT_HP_EVENT:
+                cxt5066_hp_automute(codec);
+                break;
+        case CONEXANT_MIC_EVENT:
+                cxt5066_ideapad_automic(codec);
                 break;
         }
 }
@@ -2067,6 +2287,23 @@ static const struct hda_input_mux cxt5066_analog_mic_boost = {
         },
 };
 
+static void cxt5066_set_mic_boost(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        snd_hda_codec_write_cache(codec, 0x17, 0,
+                AC_VERB_SET_AMP_GAIN_MUTE,
+                AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT | AC_AMP_SET_OUTPUT |
+                        cxt5066_analog_mic_boost.items[spec->mic_boost].index);
+        if (spec->ideapad) {
+                /* adjust the internal mic as well...it is not through 0x17 */
+                snd_hda_codec_write_cache(codec, 0x23, 0,
+                        AC_VERB_SET_AMP_GAIN_MUTE,
+                        AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT | AC_AMP_SET_INPUT |
+                                cxt5066_analog_mic_boost.
+                                        items[spec->mic_boost].index);
+        }
+}
+
 static int cxt5066_mic_boost_mux_enum_info(struct snd_kcontrol *kcontrol,
                                            struct snd_ctl_elem_info *uinfo)
 {
@@ -2077,12 +2314,8 @@ static int cxt5066_mic_boost_mux_enum_get(struct snd_kcontrol *kcontrol,
                                           struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        int val;
-
-        val = snd_hda_codec_read(codec, 0x17, 0,
-                AC_VERB_GET_AMP_GAIN_MUTE, AC_AMP_GET_OUTPUT);
-
-        ucontrol->value.enumerated.item[0] = val & AC_AMP_GAIN;
+        struct conexant_spec *spec = codec->spec;
+        ucontrol->value.enumerated.item[0] = spec->mic_boost;
         return 0;
 }
 
@@ -2090,23 +2323,132 @@ static int cxt5066_mic_boost_mux_enum_put(struct snd_kcontrol *kcontrol,
                                           struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
         const struct hda_input_mux *imux = &cxt5066_analog_mic_boost;
         unsigned int idx;
+        idx = ucontrol->value.enumerated.item[0];
+        if (idx >= imux->num_items)
+                idx = imux->num_items - 1;
 
-        if (!imux->num_items)
+        spec->mic_boost = idx;
+        if (!spec->dc_enable)
+                cxt5066_set_mic_boost(codec);
+        return 1;
+}
+
+static void cxt5066_enable_dc(struct hda_codec *codec)
+{
+        const struct hda_verb enable_dc_mode[] = {
+                /* disable gain */
+                {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+                /* switch to DC input */
+                {0x17, AC_VERB_SET_CONNECT_SEL, 3},
+                {}
+        };
+
+        /* configure as input source */
+        snd_hda_sequence_write(codec, enable_dc_mode);
+        cxt5066_olpc_select_mic(codec); /* also sets configured bias */
+}
+
+static void cxt5066_disable_dc(struct hda_codec *codec)
+{
+        /* reconfigure input source */
+        cxt5066_set_mic_boost(codec);
+        /* automic also selects the right mic if we're recording */
+        cxt5066_olpc_automic(codec);
+}
+
+static int cxt5066_olpc_dc_get(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
+        ucontrol->value.integer.value[0] = spec->dc_enable;
+        return 0;
+}
+
+static int cxt5066_olpc_dc_put(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
+        int dc_enable = !!ucontrol->value.integer.value[0];
+
+        if (dc_enable == spec->dc_enable)
                 return 0;
+
+        spec->dc_enable = dc_enable;
+        if (dc_enable)
+                cxt5066_enable_dc(codec);
+        else
+                cxt5066_disable_dc(codec);
+
+        return 1;
+}
+
+static int cxt5066_olpc_dc_bias_enum_info(struct snd_kcontrol *kcontrol,
+                                           struct snd_ctl_elem_info *uinfo)
+{
+        return snd_hda_input_mux_info(&cxt5066_olpc_dc_bias, uinfo);
+}
+
+static int cxt5066_olpc_dc_bias_enum_get(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
+        ucontrol->value.enumerated.item[0] = spec->dc_input_bias;
+        return 0;
+}
+
+static int cxt5066_olpc_dc_bias_enum_put(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
+        const struct hda_input_mux *imux = &cxt5066_analog_mic_boost;
+        unsigned int idx;
+
         idx = ucontrol->value.enumerated.item[0];
         if (idx >= imux->num_items)
                 idx = imux->num_items - 1;
 
-        snd_hda_codec_write_cache(codec, 0x17, 0,
-                AC_VERB_SET_AMP_GAIN_MUTE,
-                AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT | AC_AMP_SET_OUTPUT |
-                        imux->items[idx].index);
-
+        spec->dc_input_bias = idx;
+        if (spec->dc_enable)
+                cxt5066_set_olpc_dc_bias(codec);
         return 1;
 }
 
+static void cxt5066_olpc_capture_prepare(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        /* mark as recording and configure the microphone widget so that the
+         * recording LED comes on. */
+        spec->recording = 1;
+        cxt5066_olpc_select_mic(codec);
+}
+
+static void cxt5066_olpc_capture_cleanup(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        const struct hda_verb disable_mics[] = {
+                /* disable external mic, port B */
+                {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+
+                /* disble internal mic, port C */
+                {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+
+                /* disable DC capture, port F */
+                {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+                {},
+        };
+
+        snd_hda_sequence_write(codec, disable_mics);
+        spec->recording = 0;
+}
+
 static struct hda_input_mux cxt5066_capture_source = {
         .num_items = 4,
         .items = {
@@ -2147,6 +2489,7 @@ static struct snd_kcontrol_new cxt5066_mixer_master_olpc[] = {
                 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                   SNDRV_CTL_ELEM_ACCESS_TLV_READ |
                                   SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK,
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_volume_info,
                 .get = snd_hda_mixer_amp_volume_get,
                 .put = snd_hda_mixer_amp_volume_put,
@@ -2158,6 +2501,24 @@ static struct snd_kcontrol_new cxt5066_mixer_master_olpc[] = {
         {}
 };
 
+static struct snd_kcontrol_new cxt5066_mixer_olpc_dc[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "DC Mode Enable Switch",
+                .info = snd_ctl_boolean_mono_info,
+                .get = cxt5066_olpc_dc_get,
+                .put = cxt5066_olpc_dc_put,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "DC Input Bias Enum",
+                .info = cxt5066_olpc_dc_bias_enum_info,
+                .get = cxt5066_olpc_dc_bias_enum_get,
+                .put = cxt5066_olpc_dc_bias_enum_put,
+        },
+        {}
+};
+
 static struct snd_kcontrol_new cxt5066_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -2181,6 +2542,19 @@ static struct snd_kcontrol_new cxt5066_mixers[] = {
         {}
 };
 
+static struct snd_kcontrol_new cxt5066_vostro_mixers[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Int Mic Boost Capture Enum",
+                .info = cxt5066_mic_boost_mux_enum_info,
+                .get = cxt5066_mic_boost_mux_enum_get,
+                .put = cxt5066_mic_boost_mux_enum_put,
+                .private_value = 0x23 | 0x100,
+        },
+        HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),
+        {}
+};
+
 static struct hda_verb cxt5066_init_verbs[] = {
         {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port B */
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port C */
@@ -2242,10 +2616,10 @@ static struct hda_verb cxt5066_init_verbs_olpc[] = {
         {0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */
 
         /* Port B: external microphone */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, CXT5066_OLPC_EXT_MIC_BIAS},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
 
         /* Port C: internal microphone */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
 
         /* Port D: unused */
         {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
@@ -2254,7 +2628,7 @@ static struct hda_verb cxt5066_init_verbs_olpc[] = {
         {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
         {0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
 
-        /* Port F: unused */
+        /* Port F: external DC input through microphone port */
         {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
 
         /* Port G: internal speakers */
@@ -2297,6 +2671,117 @@ static struct hda_verb cxt5066_init_verbs_olpc[] = {
         { } /* end */
 };
 
+static struct hda_verb cxt5066_init_verbs_vostro[] = {
+        /* Port A: headphones */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */
+
+        /* Port B: external microphone */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+
+        /* Port C: unused */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+
+        /* Port D: unused */
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+
+        /* Port E: unused, but has primary EAPD */
+        {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
+
+        /* Port F: unused */
+        {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+
+        /* Port G: internal speakers */
+        {0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x1f, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */
+
+        /* DAC1 */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        /* DAC2: unused */
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+
+        /* Digital microphone port */
+        {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+        /* Audio input selectors */
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x3},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+
+        /* Disable SPDIF */
+        {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+
+        /* enable unsolicited events for Port A and B */
+        {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
+        {0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},
+        { } /* end */
+};
+
+static struct hda_verb cxt5066_init_verbs_ideapad[] = {
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port B */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port C */
+        {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port F */
+        {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port E */
+
+        /* Speakers  */
+        {0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x1f, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */
+
+        /* HP, Amp  */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */
+
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1c, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */
+
+        /* DAC1 */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        /* Node 14 connections: 0x17 0x18 0x23 0x24 0x27 */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x50},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2) | 0x50},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        {0x14, AC_VERB_SET_CONNECT_SEL, 2},     /* default to internal mic */
+
+        /* Audio input selector */
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x2},
+        {0x17, AC_VERB_SET_CONNECT_SEL, 1},     /* route ext mic */
+
+        /* SPDIF route: PCM */
+        {0x20, AC_VERB_SET_CONNECT_SEL, 0x0},
+        {0x22, AC_VERB_SET_CONNECT_SEL, 0x0},
+
+        {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+
+        /* internal microphone */
+        {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable int mic */
+
+        /* EAPD */
+        {0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
+
+        {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},
+        { } /* end */
+};
+
 static struct hda_verb cxt5066_init_verbs_portd_lo[] = {
         {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         { } /* end */
@@ -2305,11 +2790,32 @@ static struct hda_verb cxt5066_init_verbs_portd_lo[] = {
 /* initialize jack-sensing, too */
 static int cxt5066_init(struct hda_codec *codec)
 {
+        struct conexant_spec *spec = codec->spec;
+
         snd_printdd("CXT5066: init\n");
         conexant_init(codec);
         if (codec->patch_ops.unsol_event) {
                 cxt5066_hp_automute(codec);
-                cxt5066_automic(codec);
+                if (spec->dell_vostro)
+                        cxt5066_vostro_automic(codec);
+                else if (spec->ideapad)
+                        cxt5066_ideapad_automic(codec);
+        }
+        cxt5066_set_mic_boost(codec);
+        return 0;
+}
+
+static int cxt5066_olpc_init(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        snd_printdd("CXT5066: init\n");
+        conexant_init(codec);
+        cxt5066_hp_automute(codec);
+        if (!spec->dc_enable) {
+                cxt5066_set_mic_boost(codec);
+                cxt5066_olpc_automic(codec);
+        } else {
+                cxt5066_enable_dc(codec);
         }
         return 0;
 }
@@ -2318,6 +2824,8 @@ enum {
         CXT5066_LAPTOP,                 /* Laptops w/ EAPD support */
         CXT5066_DELL_LAPTOP,    /* Dell Laptop */
         CXT5066_OLPC_XO_1_5,    /* OLPC XO 1.5 */
+        CXT5066_DELL_VOSTO,     /* Dell Vostro 1015i */
+        CXT5066_IDEAPAD,        /* Lenovo IdeaPad U150 */
         CXT5066_MODELS
 };
 
@@ -2325,6 +2833,8 @@ static const char *cxt5066_models[CXT5066_MODELS] = {
         [CXT5066_LAPTOP]                = "laptop",
         [CXT5066_DELL_LAPTOP]   = "dell-laptop",
         [CXT5066_OLPC_XO_1_5]   = "olpc-xo-1_5",
+        [CXT5066_DELL_VOSTO]    = "dell-vostro",
+        [CXT5066_IDEAPAD]       = "ideapad",
 };
 
 static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
@@ -2333,6 +2843,12 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",
                       CXT5066_DELL_LAPTOP),
         SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
+        SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO),
+        SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),
+        SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),
+        SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),
+        SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD),
+        SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD),
         {}
 };
 
@@ -2347,7 +2863,7 @@ static int patch_cxt5066(struct hda_codec *codec)
         codec->spec = spec;
 
         codec->patch_ops = conexant_patch_ops;
-        codec->patch_ops.init = cxt5066_init;
+        codec->patch_ops.init = conexant_init;
 
         spec->dell_automute = 0;
         spec->multiout.max_channels = 2;
@@ -2360,7 +2876,6 @@ static int patch_cxt5066(struct hda_codec *codec)
         spec->input_mux = &cxt5066_capture_source;
 
         spec->port_d_mode = PIN_HP;
-        spec->ext_mic_bias = PIN_VREF80;
 
         spec->num_init_verbs = 1;
         spec->init_verbs[0] = cxt5066_init_verbs;
@@ -2387,12 +2902,53 @@ static int patch_cxt5066(struct hda_codec *codec)
                 spec->dell_automute = 1;
                 break;
         case CXT5066_OLPC_XO_1_5:
-                codec->patch_ops.unsol_event = cxt5066_unsol_event;
+                codec->patch_ops.init = cxt5066_olpc_init;
+                codec->patch_ops.unsol_event = cxt5066_olpc_unsol_event;
                 spec->init_verbs[0] = cxt5066_init_verbs_olpc;
                 spec->mixers[spec->num_mixers++] = cxt5066_mixer_master_olpc;
+                spec->mixers[spec->num_mixers++] = cxt5066_mixer_olpc_dc;
+                spec->mixers[spec->num_mixers++] = cxt5066_mixers;
+                spec->port_d_mode = 0;
+                spec->mic_boost = 3; /* default 30dB gain */
+
+                /* no S/PDIF out */
+                spec->multiout.dig_out_nid = 0;
+
+                /* input source automatically selected */
+                spec->input_mux = NULL;
+
+                /* our capture hooks which allow us to turn on the microphone LED
+                 * at the right time */
+                spec->capture_prepare = cxt5066_olpc_capture_prepare;
+                spec->capture_cleanup = cxt5066_olpc_capture_cleanup;
+                break;
+        case CXT5066_DELL_VOSTO:
+                codec->patch_ops.init = cxt5066_init;
+                codec->patch_ops.unsol_event = cxt5066_vostro_event;
+                spec->init_verbs[0] = cxt5066_init_verbs_vostro;
+                spec->mixers[spec->num_mixers++] = cxt5066_mixer_master_olpc;
                 spec->mixers[spec->num_mixers++] = cxt5066_mixers;
+                spec->mixers[spec->num_mixers++] = cxt5066_vostro_mixers;
                 spec->port_d_mode = 0;
-                spec->ext_mic_bias = CXT5066_OLPC_EXT_MIC_BIAS;
+                spec->dell_vostro = 1;
+                spec->mic_boost = 3; /* default 30dB gain */
+                snd_hda_attach_beep_device(codec, 0x13);
+
+                /* no S/PDIF out */
+                spec->multiout.dig_out_nid = 0;
+
+                /* input source automatically selected */
+                spec->input_mux = NULL;
+                break;
+        case CXT5066_IDEAPAD:
+                codec->patch_ops.init = cxt5066_init;
+                codec->patch_ops.unsol_event = cxt5066_ideapad_event;
+                spec->mixers[spec->num_mixers++] = cxt5066_mixer_master;
+                spec->mixers[spec->num_mixers++] = cxt5066_mixers;
+                spec->init_verbs[0] = cxt5066_init_verbs_ideapad;
+                spec->port_d_mode = 0;
+                spec->ideapad = 1;
+                spec->mic_boost = 2;    /* default 20dB gain */
 
                 /* no S/PDIF out */
                 spec->multiout.dig_out_nid = 0;
@@ -2417,6 +2973,8 @@ static struct hda_codec_preset snd_hda_preset_conexant[] = {
           .patch = patch_cxt5051 },
         { .id = 0x14f15066, .name = "CX20582 (Pebble)",
           .patch = patch_cxt5066 },
+        { .id = 0x14f15067, .name = "CX20583 (Pebble HSF)",
+          .patch = patch_cxt5066 },
         {} /* terminator */
 };
 
@@ -2424,6 +2982,7 @@ MODULE_ALIAS("snd-hda-codec-id:14f15045");
 MODULE_ALIAS("snd-hda-codec-id:14f15047");
 MODULE_ALIAS("snd-hda-codec-id:14f15051");
 MODULE_ALIAS("snd-hda-codec-id:14f15066");
+MODULE_ALIAS("snd-hda-codec-id:14f15067");
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Conexant HD-audio codec");
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
new file mode 100644
index 000000000000..2c2bafbf0258
--- /dev/null
+++ b/sound/pci/hda/patch_hdmi.c
@@ -0,0 +1,849 @@
+/*
+ *
+ *  patch_hdmi.c - routines for HDMI/DisplayPort codecs
+ *
+ *  Copyright(c) 2008-2010 Intel Corporation. All rights reserved.
+ *
+ *  Authors:
+ *                      Wu Fengguang <wfg@linux.intel.com>
+ *
+ *  Maintained by:
+ *                      Wu Fengguang <wfg@linux.intel.com>
+ *
+ *  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; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  This program 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.
+ */
+
+
+struct hdmi_spec {
+        int num_cvts;
+        int num_pins;
+        hda_nid_t cvt[MAX_HDMI_CVTS+1];  /* audio sources */
+        hda_nid_t pin[MAX_HDMI_PINS+1];  /* audio sinks */
+
+        /*
+         * source connection for each pin
+         */
+        hda_nid_t pin_cvt[MAX_HDMI_PINS+1];
+
+        /*
+         * HDMI sink attached to each pin
+         */
+        struct hdmi_eld sink_eld[MAX_HDMI_PINS];
+
+        /*
+         * export one pcm per pipe
+         */
+        struct hda_pcm  pcm_rec[MAX_HDMI_CVTS];
+
+        /*
+         * nvhdmi specific
+         */
+        struct hda_multi_out multiout;
+        unsigned int codec_type;
+};
+
+
+struct hdmi_audio_infoframe {
+        u8 type; /* 0x84 */
+        u8 ver;  /* 0x01 */
+        u8 len;  /* 0x0a */
+
+        u8 checksum;    /* PB0 */
+        u8 CC02_CT47;   /* CC in bits 0:2, CT in 4:7 */
+        u8 SS01_SF24;
+        u8 CXT04;
+        u8 CA;
+        u8 LFEPBL01_LSV36_DM_INH7;
+        u8 reserved[5]; /* PB6 - PB10 */
+};
+
+/*
+ * CEA speaker placement:
+ *
+ *        FLH       FCH        FRH
+ *  FLW    FL  FLC   FC   FRC   FR   FRW
+ *
+ *                                  LFE
+ *                     TC
+ *
+ *          RL  RLC   RC   RRC   RR
+ *
+ * The Left/Right Surround channel _notions_ LS/RS in SMPTE 320M corresponds to
+ * CEA RL/RR; The SMPTE channel _assignment_ C/LFE is swapped to CEA LFE/FC.
+ */
+enum cea_speaker_placement {
+        FL  = (1 <<  0),        /* Front Left           */
+        FC  = (1 <<  1),        /* Front Center         */
+        FR  = (1 <<  2),        /* Front Right          */
+        FLC = (1 <<  3),        /* Front Left Center    */
+        FRC = (1 <<  4),        /* Front Right Center   */
+        RL  = (1 <<  5),        /* Rear Left            */
+        RC  = (1 <<  6),        /* Rear Center          */
+        RR  = (1 <<  7),        /* Rear Right           */
+        RLC = (1 <<  8),        /* Rear Left Center     */
+        RRC = (1 <<  9),        /* Rear Right Center    */
+        LFE = (1 << 10),        /* Low Frequency Effect */
+        FLW = (1 << 11),        /* Front Left Wide      */
+        FRW = (1 << 12),        /* Front Right Wide     */
+        FLH = (1 << 13),        /* Front Left High      */
+        FCH = (1 << 14),        /* Front Center High    */
+        FRH = (1 << 15),        /* Front Right High     */
+        TC  = (1 << 16),        /* Top Center           */
+};
+
+/*
+ * ELD SA bits in the CEA Speaker Allocation data block
+ */
+static int eld_speaker_allocation_bits[] = {
+        [0] = FL | FR,
+        [1] = LFE,
+        [2] = FC,
+        [3] = RL | RR,
+        [4] = RC,
+        [5] = FLC | FRC,
+        [6] = RLC | RRC,
+        /* the following are not defined in ELD yet */
+        [7] = FLW | FRW,
+        [8] = FLH | FRH,
+        [9] = TC,
+        [10] = FCH,
+};
+
+struct cea_channel_speaker_allocation {
+        int ca_index;
+        int speakers[8];
+
+        /* derived values, just for convenience */
+        int channels;
+        int spk_mask;
+};
+
+/*
+ * ALSA sequence is:
+ *
+ *       surround40   surround41   surround50   surround51   surround71
+ * ch0   front left   =            =            =            =
+ * ch1   front right  =            =            =            =
+ * ch2   rear left    =            =            =            =
+ * ch3   rear right   =            =            =            =
+ * ch4                LFE          center       center       center
+ * ch5                                          LFE          LFE
+ * ch6                                                       side left
+ * ch7                                                       side right
+ *
+ * surround71 = {FL, FR, RLC, RRC, FC, LFE, RL, RR}
+ */
+static int hdmi_channel_mapping[0x32][8] = {
+        /* stereo */
+        [0x00] = { 0x00, 0x11, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7 },
+        /* 2.1 */
+        [0x01] = { 0x00, 0x11, 0x22, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7 },
+        /* Dolby Surround */
+        [0x02] = { 0x00, 0x11, 0x23, 0xf2, 0xf4, 0xf5, 0xf6, 0xf7 },
+        /* surround40 */
+        [0x08] = { 0x00, 0x11, 0x24, 0x35, 0xf3, 0xf2, 0xf6, 0xf7 },
+        /* 4ch */
+        [0x03] = { 0x00, 0x11, 0x23, 0x32, 0x44, 0xf5, 0xf6, 0xf7 },
+        /* surround41 */
+        [0x09] = { 0x00, 0x11, 0x24, 0x34, 0x43, 0xf2, 0xf6, 0xf7 },
+        /* surround50 */
+        [0x0a] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0xf2, 0xf6, 0xf7 },
+        /* surround51 */
+        [0x0b] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0x52, 0xf6, 0xf7 },
+        /* 7.1 */
+        [0x13] = { 0x00, 0x11, 0x26, 0x37, 0x43, 0x52, 0x64, 0x75 },
+};
+
+/*
+ * This is an ordered list!
+ *
+ * The preceding ones have better chances to be selected by
+ * hdmi_setup_channel_allocation().
+ */
+static struct cea_channel_speaker_allocation channel_allocations[] = {
+/*                        channel:   7     6    5    4    3     2    1    0  */
+{ .ca_index = 0x00,  .speakers = {   0,    0,   0,   0,   0,    0,  FR,  FL } },
+                                 /* 2.1 */
+{ .ca_index = 0x01,  .speakers = {   0,    0,   0,   0,   0,  LFE,  FR,  FL } },
+                                 /* Dolby Surround */
+{ .ca_index = 0x02,  .speakers = {   0,    0,   0,   0,  FC,    0,  FR,  FL } },
+                                 /* surround40 */
+{ .ca_index = 0x08,  .speakers = {   0,    0,  RR,  RL,   0,    0,  FR,  FL } },
+                                 /* surround41 */
+{ .ca_index = 0x09,  .speakers = {   0,    0,  RR,  RL,   0,  LFE,  FR,  FL } },
+                                 /* surround50 */
+{ .ca_index = 0x0a,  .speakers = {   0,    0,  RR,  RL,  FC,    0,  FR,  FL } },
+                                 /* surround51 */
+{ .ca_index = 0x0b,  .speakers = {   0,    0,  RR,  RL,  FC,  LFE,  FR,  FL } },
+                                 /* 6.1 */
+{ .ca_index = 0x0f,  .speakers = {   0,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },
+                                 /* surround71 */
+{ .ca_index = 0x13,  .speakers = { RRC,  RLC,  RR,  RL,  FC,  LFE,  FR,  FL } },
+
+{ .ca_index = 0x03,  .speakers = {   0,    0,   0,   0,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x04,  .speakers = {   0,    0,   0,  RC,   0,    0,  FR,  FL } },
+{ .ca_index = 0x05,  .speakers = {   0,    0,   0,  RC,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x06,  .speakers = {   0,    0,   0,  RC,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x07,  .speakers = {   0,    0,   0,  RC,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x0c,  .speakers = {   0,   RC,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x0d,  .speakers = {   0,   RC,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x0e,  .speakers = {   0,   RC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x10,  .speakers = { RRC,  RLC,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x11,  .speakers = { RRC,  RLC,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x12,  .speakers = { RRC,  RLC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x14,  .speakers = { FRC,  FLC,   0,   0,   0,    0,  FR,  FL } },
+{ .ca_index = 0x15,  .speakers = { FRC,  FLC,   0,   0,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x16,  .speakers = { FRC,  FLC,   0,   0,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x17,  .speakers = { FRC,  FLC,   0,   0,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x18,  .speakers = { FRC,  FLC,   0,  RC,   0,    0,  FR,  FL } },
+{ .ca_index = 0x19,  .speakers = { FRC,  FLC,   0,  RC,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x1a,  .speakers = { FRC,  FLC,   0,  RC,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x1b,  .speakers = { FRC,  FLC,   0,  RC,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x1c,  .speakers = { FRC,  FLC,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x1d,  .speakers = { FRC,  FLC,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x1e,  .speakers = { FRC,  FLC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x1f,  .speakers = { FRC,  FLC,  RR,  RL,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x20,  .speakers = {   0,  FCH,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x21,  .speakers = {   0,  FCH,  RR,  RL,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x22,  .speakers = {  TC,    0,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x23,  .speakers = {  TC,    0,  RR,  RL,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x24,  .speakers = { FRH,  FLH,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x25,  .speakers = { FRH,  FLH,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x26,  .speakers = { FRW,  FLW,  RR,  RL,   0,    0,  FR,  FL } },
+{ .ca_index = 0x27,  .speakers = { FRW,  FLW,  RR,  RL,   0,  LFE,  FR,  FL } },
+{ .ca_index = 0x28,  .speakers = {  TC,   RC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x29,  .speakers = {  TC,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x2a,  .speakers = { FCH,   RC,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x2b,  .speakers = { FCH,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x2c,  .speakers = {  TC,  FCH,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x2d,  .speakers = {  TC,  FCH,  RR,  RL,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x2e,  .speakers = { FRH,  FLH,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x2f,  .speakers = { FRH,  FLH,  RR,  RL,  FC,  LFE,  FR,  FL } },
+{ .ca_index = 0x30,  .speakers = { FRW,  FLW,  RR,  RL,  FC,    0,  FR,  FL } },
+{ .ca_index = 0x31,  .speakers = { FRW,  FLW,  RR,  RL,  FC,  LFE,  FR,  FL } },
+};
+
+
+/*
+ * HDMI routines
+ */
+
+static int hda_node_index(hda_nid_t *nids, hda_nid_t nid)
+{
+        int i;
+
+        for (i = 0; nids[i]; i++)
+                if (nids[i] == nid)
+                        return i;
+
+        snd_printk(KERN_WARNING "HDMI: nid %d not registered\n", nid);
+        return -EINVAL;
+}
+
+static void hdmi_get_show_eld(struct hda_codec *codec, hda_nid_t pin_nid,
+                              struct hdmi_eld *eld)
+{
+        if (!snd_hdmi_get_eld(eld, codec, pin_nid))
+                snd_hdmi_show_eld(eld);
+}
+
+#ifdef BE_PARANOID
+static void hdmi_get_dip_index(struct hda_codec *codec, hda_nid_t pin_nid,
+                                int *packet_index, int *byte_index)
+{
+        int val;
+
+        val = snd_hda_codec_read(codec, pin_nid, 0,
+                                 AC_VERB_GET_HDMI_DIP_INDEX, 0);
+
+        *packet_index = val >> 5;
+        *byte_index = val & 0x1f;
+}
+#endif
+
+static void hdmi_set_dip_index(struct hda_codec *codec, hda_nid_t pin_nid,
+                                int packet_index, int byte_index)
+{
+        int val;
+
+        val = (packet_index << 5) | (byte_index & 0x1f);
+
+        snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_INDEX, val);
+}
+
+static void hdmi_write_dip_byte(struct hda_codec *codec, hda_nid_t pin_nid,
+                                unsigned char val)
+{
+        snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_DATA, val);
+}
+
+static void hdmi_enable_output(struct hda_codec *codec, hda_nid_t pin_nid)
+{
+        /* Unmute */
+        if (get_wcaps(codec, pin_nid) & AC_WCAP_OUT_AMP)
+                snd_hda_codec_write(codec, pin_nid, 0,
+                                AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+        /* Enable pin out */
+        snd_hda_codec_write(codec, pin_nid, 0,
+                            AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+}
+
+static int hdmi_get_channel_count(struct hda_codec *codec, hda_nid_t nid)
+{
+        return 1 + snd_hda_codec_read(codec, nid, 0,
+                                        AC_VERB_GET_CVT_CHAN_COUNT, 0);
+}
+
+static void hdmi_set_channel_count(struct hda_codec *codec,
+                                   hda_nid_t nid, int chs)
+{
+        if (chs != hdmi_get_channel_count(codec, nid))
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);
+}
+
+
+/*
+ * Channel mapping routines
+ */
+
+/*
+ * Compute derived values in channel_allocations[].
+ */
+static void init_channel_allocations(void)
+{
+        int i, j;
+        struct cea_channel_speaker_allocation *p;
+
+        for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) {
+                p = channel_allocations + i;
+                p->channels = 0;
+                p->spk_mask = 0;
+                for (j = 0; j < ARRAY_SIZE(p->speakers); j++)
+                        if (p->speakers[j]) {
+                                p->channels++;
+                                p->spk_mask |= p->speakers[j];
+                        }
+        }
+}
+
+/*
+ * The transformation takes two steps:
+ *
+ *      eld->spk_alloc => (eld_speaker_allocation_bits[]) => spk_mask
+ *            spk_mask => (channel_allocations[])         => ai->CA
+ *
+ * TODO: it could select the wrong CA from multiple candidates.
+*/
+static int hdmi_setup_channel_allocation(struct hda_codec *codec, hda_nid_t nid,
+                                         struct hdmi_audio_infoframe *ai)
+{
+        struct hdmi_spec *spec = codec->spec;
+        struct hdmi_eld *eld;
+        int i;
+        int spk_mask = 0;
+        int channels = 1 + (ai->CC02_CT47 & 0x7);
+        char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
+
+        /*
+         * CA defaults to 0 for basic stereo audio
+         */
+        if (channels <= 2)
+                return 0;
+
+        i = hda_node_index(spec->pin_cvt, nid);
+        if (i < 0)
+                return 0;
+        eld = &spec->sink_eld[i];
+
+        /*
+         * HDMI sink's ELD info cannot always be retrieved for now, e.g.
+         * in console or for audio devices. Assume the highest speakers
+         * configuration, to _not_ prohibit multi-channel audio playback.
+         */
+        if (!eld->spk_alloc)
+                eld->spk_alloc = 0xffff;
+
+        /*
+         * expand ELD's speaker allocation mask
+         *
+         * ELD tells the speaker mask in a compact(paired) form,
+         * expand ELD's notions to match the ones used by Audio InfoFrame.
+         */
+        for (i = 0; i < ARRAY_SIZE(eld_speaker_allocation_bits); i++) {
+                if (eld->spk_alloc & (1 << i))
+                        spk_mask |= eld_speaker_allocation_bits[i];
+        }
+
+        /* search for the first working match in the CA table */
+        for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) {
+                if (channels == channel_allocations[i].channels &&
+                    (spk_mask & channel_allocations[i].spk_mask) ==
+                                channel_allocations[i].spk_mask) {
+                        ai->CA = channel_allocations[i].ca_index;
+                        break;
+                }
+        }
+
+        snd_print_channel_allocation(eld->spk_alloc, buf, sizeof(buf));
+        snd_printdd("HDMI: select CA 0x%x for %d-channel allocation: %s\n",
+                    ai->CA, channels, buf);
+
+        return ai->CA;
+}
+
+static void hdmi_debug_channel_mapping(struct hda_codec *codec,
+                                       hda_nid_t pin_nid)
+{
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+        int i;
+        int slot;
+
+        for (i = 0; i < 8; i++) {
+                slot = snd_hda_codec_read(codec, pin_nid, 0,
+                                                AC_VERB_GET_HDMI_CHAN_SLOT, i);
+                printk(KERN_DEBUG "HDMI: ASP channel %d => slot %d\n",
+                                                slot >> 4, slot & 0xf);
+        }
+#endif
+}
+
+
+static void hdmi_setup_channel_mapping(struct hda_codec *codec,
+                                       hda_nid_t pin_nid,
+                                       struct hdmi_audio_infoframe *ai)
+{
+        int i;
+        int ca = ai->CA;
+        int err;
+
+        if (hdmi_channel_mapping[ca][1] == 0) {
+                for (i = 0; i < channel_allocations[ca].channels; i++)
+                        hdmi_channel_mapping[ca][i] = i | (i << 4);
+                for (; i < 8; i++)
+                        hdmi_channel_mapping[ca][i] = 0xf | (i << 4);
+        }
+
+        for (i = 0; i < 8; i++) {
+                err = snd_hda_codec_write(codec, pin_nid, 0,
+                                          AC_VERB_SET_HDMI_CHAN_SLOT,
+                                          hdmi_channel_mapping[ca][i]);
+                if (err) {
+                        snd_printdd(KERN_NOTICE
+                                    "HDMI: channel mapping failed\n");
+                        break;
+                }
+        }
+
+        hdmi_debug_channel_mapping(codec, pin_nid);
+}
+
+
+/*
+ * Audio InfoFrame routines
+ */
+
+/*
+ * Enable Audio InfoFrame Transmission
+ */
+static void hdmi_start_infoframe_trans(struct hda_codec *codec,
+                                       hda_nid_t pin_nid)
+{
+        hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
+        snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,
+                                                AC_DIPXMIT_BEST);
+}
+
+/*
+ * Disable Audio InfoFrame Transmission
+ */
+static void hdmi_stop_infoframe_trans(struct hda_codec *codec,
+                                      hda_nid_t pin_nid)
+{
+        hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
+        snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,
+                                                AC_DIPXMIT_DISABLE);
+}
+
+static void hdmi_debug_dip_size(struct hda_codec *codec, hda_nid_t pin_nid)
+{
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+        int i;
+        int size;
+
+        size = snd_hdmi_get_eld_size(codec, pin_nid);
+        printk(KERN_DEBUG "HDMI: ELD buf size is %d\n", size);
+
+        for (i = 0; i < 8; i++) {
+                size = snd_hda_codec_read(codec, pin_nid, 0,
+                                                AC_VERB_GET_HDMI_DIP_SIZE, i);
+                printk(KERN_DEBUG "HDMI: DIP GP[%d] buf size is %d\n", i, size);
+        }
+#endif
+}
+
+static void hdmi_clear_dip_buffers(struct hda_codec *codec, hda_nid_t pin_nid)
+{
+#ifdef BE_PARANOID
+        int i, j;
+        int size;
+        int pi, bi;
+        for (i = 0; i < 8; i++) {
+                size = snd_hda_codec_read(codec, pin_nid, 0,
+                                                AC_VERB_GET_HDMI_DIP_SIZE, i);
+                if (size == 0)
+                        continue;
+
+                hdmi_set_dip_index(codec, pin_nid, i, 0x0);
+                for (j = 1; j < 1000; j++) {
+                        hdmi_write_dip_byte(codec, pin_nid, 0x0);
+                        hdmi_get_dip_index(codec, pin_nid, &pi, &bi);
+                        if (pi != i)
+                                snd_printd(KERN_INFO "dip index %d: %d != %d\n",
+                                                bi, pi, i);
+                        if (bi == 0) /* byte index wrapped around */
+                                break;
+                }
+                snd_printd(KERN_INFO
+                        "HDMI: DIP GP[%d] buf reported size=%d, written=%d\n",
+                        i, size, j);
+        }
+#endif
+}
+
+static void hdmi_checksum_audio_infoframe(struct hdmi_audio_infoframe *ai)
+{
+        u8 *bytes = (u8 *)ai;
+        u8 sum = 0;
+        int i;
+
+        ai->checksum = 0;
+
+        for (i = 0; i < sizeof(*ai); i++)
+                sum += bytes[i];
+
+        ai->checksum = -sum;
+}
+
+static void hdmi_fill_audio_infoframe(struct hda_codec *codec,
+                                      hda_nid_t pin_nid,
+                                      struct hdmi_audio_infoframe *ai)
+{
+        u8 *bytes = (u8 *)ai;
+        int i;
+
+        hdmi_debug_dip_size(codec, pin_nid);
+        hdmi_clear_dip_buffers(codec, pin_nid); /* be paranoid */
+
+        hdmi_checksum_audio_infoframe(ai);
+
+        hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
+        for (i = 0; i < sizeof(*ai); i++)
+                hdmi_write_dip_byte(codec, pin_nid, bytes[i]);
+}
+
+static bool hdmi_infoframe_uptodate(struct hda_codec *codec, hda_nid_t pin_nid,
+                                    struct hdmi_audio_infoframe *ai)
+{
+        u8 *bytes = (u8 *)ai;
+        u8 val;
+        int i;
+
+        if (snd_hda_codec_read(codec, pin_nid, 0, AC_VERB_GET_HDMI_DIP_XMIT, 0)
+                                                            != AC_DIPXMIT_BEST)
+                return false;
+
+        hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
+        for (i = 0; i < sizeof(*ai); i++) {
+                val = snd_hda_codec_read(codec, pin_nid, 0,
+                                         AC_VERB_GET_HDMI_DIP_DATA, 0);
+                if (val != bytes[i])
+                        return false;
+        }
+
+        return true;
+}
+
+static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid,
+                                        struct snd_pcm_substream *substream)
+{
+        struct hdmi_spec *spec = codec->spec;
+        hda_nid_t pin_nid;
+        int i;
+        struct hdmi_audio_infoframe ai = {
+                .type           = 0x84,
+                .ver            = 0x01,
+                .len            = 0x0a,
+                .CC02_CT47      = substream->runtime->channels - 1,
+        };
+
+        hdmi_setup_channel_allocation(codec, nid, &ai);
+
+        for (i = 0; i < spec->num_pins; i++) {
+                if (spec->pin_cvt[i] != nid)
+                        continue;
+                if (!spec->sink_eld[i].monitor_present)
+                        continue;
+
+                pin_nid = spec->pin[i];
+                if (!hdmi_infoframe_uptodate(codec, pin_nid, &ai)) {
+                        snd_printdd("hdmi_setup_audio_infoframe: "
+                                    "cvt=%d pin=%d channels=%d\n",
+                                    nid, pin_nid,
+                                    substream->runtime->channels);
+                        hdmi_setup_channel_mapping(codec, pin_nid, &ai);
+                        hdmi_stop_infoframe_trans(codec, pin_nid);
+                        hdmi_fill_audio_infoframe(codec, pin_nid, &ai);
+                        hdmi_start_infoframe_trans(codec, pin_nid);
+                }
+        }
+}
+
+
+/*
+ * Unsolicited events
+ */
+
+static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
+{
+        struct hdmi_spec *spec = codec->spec;
+        int tag = res >> AC_UNSOL_RES_TAG_SHIFT;
+        int pind = !!(res & AC_UNSOL_RES_PD);
+        int eldv = !!(res & AC_UNSOL_RES_ELDV);
+        int index;
+
+        printk(KERN_INFO
+                "HDMI hot plug event: Pin=%d Presence_Detect=%d ELD_Valid=%d\n",
+                tag, pind, eldv);
+
+        index = hda_node_index(spec->pin, tag);
+        if (index < 0)
+                return;
+
+        spec->sink_eld[index].monitor_present = pind;
+        spec->sink_eld[index].eld_valid = eldv;
+
+        if (pind && eldv) {
+                hdmi_get_show_eld(codec, spec->pin[index],
+                                  &spec->sink_eld[index]);
+                /* TODO: do real things about ELD */
+        }
+}
+
+static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
+{
+        int tag = res >> AC_UNSOL_RES_TAG_SHIFT;
+        int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT;
+        int cp_state = !!(res & AC_UNSOL_RES_CP_STATE);
+        int cp_ready = !!(res & AC_UNSOL_RES_CP_READY);
+
+        printk(KERN_INFO
+                "HDMI CP event: PIN=%d SUBTAG=0x%x CP_STATE=%d CP_READY=%d\n",
+                tag,
+                subtag,
+                cp_state,
+                cp_ready);
+
+        /* TODO */
+        if (cp_state)
+                ;
+        if (cp_ready)
+                ;
+}
+
+
+static void hdmi_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        struct hdmi_spec *spec = codec->spec;
+        int tag = res >> AC_UNSOL_RES_TAG_SHIFT;
+        int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT;
+
+        if (hda_node_index(spec->pin, tag) < 0) {
+                snd_printd(KERN_INFO "Unexpected HDMI event tag 0x%x\n", tag);
+                return;
+        }
+
+        if (subtag == 0)
+                hdmi_intrinsic_event(codec, res);
+        else
+                hdmi_non_intrinsic_event(codec, res);
+}
+
+/*
+ * Callbacks
+ */
+
+static void hdmi_setup_stream(struct hda_codec *codec, hda_nid_t nid,
+                              u32 stream_tag, int format)
+{
+        int tag;
+        int fmt;
+
+        tag = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONV, 0) >> 4;
+        fmt = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_STREAM_FORMAT, 0);
+
+        snd_printdd("hdmi_setup_stream: "
+                    "NID=0x%x, %sstream=0x%x, %sformat=0x%x\n",
+                    nid,
+                    tag == stream_tag ? "" : "new-",
+                    stream_tag,
+                    fmt == format ? "" : "new-",
+                    format);
+
+        if (tag != stream_tag)
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_CHANNEL_STREAMID,
+                                    stream_tag << 4);
+        if (fmt != format)
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_STREAM_FORMAT, format);
+}
+
+/*
+ * HDA/HDMI auto parsing
+ */
+
+static int hdmi_read_pin_conn(struct hda_codec *codec, hda_nid_t pin_nid)
+{
+        struct hdmi_spec *spec = codec->spec;
+        hda_nid_t conn_list[HDA_MAX_CONNECTIONS];
+        int conn_len, curr;
+        int index;
+
+        if (!(get_wcaps(codec, pin_nid) & AC_WCAP_CONN_LIST)) {
+                snd_printk(KERN_WARNING
+                           "HDMI: pin %d wcaps %#x "
+                           "does not support connection list\n",
+                           pin_nid, get_wcaps(codec, pin_nid));
+                return -EINVAL;
+        }
+
+        conn_len = snd_hda_get_connections(codec, pin_nid, conn_list,
+                                           HDA_MAX_CONNECTIONS);
+        if (conn_len > 1)
+                curr = snd_hda_codec_read(codec, pin_nid, 0,
+                                          AC_VERB_GET_CONNECT_SEL, 0);
+        else
+                curr = 0;
+
+        index = hda_node_index(spec->pin, pin_nid);
+        if (index < 0)
+                return -EINVAL;
+
+        spec->pin_cvt[index] = conn_list[curr];
+
+        return 0;
+}
+
+static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid,
+                               struct hdmi_eld *eld)
+{
+        int present = snd_hda_pin_sense(codec, pin_nid);
+
+        eld->monitor_present    = !!(present & AC_PINSENSE_PRESENCE);
+        eld->eld_valid          = !!(present & AC_PINSENSE_ELDV);
+
+        if (present & AC_PINSENSE_ELDV)
+                hdmi_get_show_eld(codec, pin_nid, eld);
+}
+
+static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
+{
+        struct hdmi_spec *spec = codec->spec;
+
+        if (spec->num_pins >= MAX_HDMI_PINS) {
+                snd_printk(KERN_WARNING
+                           "HDMI: no space for pin %d\n", pin_nid);
+                return -EINVAL;
+        }
+
+        hdmi_present_sense(codec, pin_nid, &spec->sink_eld[spec->num_pins]);
+
+        spec->pin[spec->num_pins] = pin_nid;
+        spec->num_pins++;
+
+        /*
+         * It is assumed that converter nodes come first in the node list and
+         * hence have been registered and usable now.
+         */
+        return hdmi_read_pin_conn(codec, pin_nid);
+}
+
+static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t nid)
+{
+        struct hdmi_spec *spec = codec->spec;
+
+        if (spec->num_cvts >= MAX_HDMI_CVTS) {
+                snd_printk(KERN_WARNING
+                           "HDMI: no space for converter %d\n", nid);
+                return -EINVAL;
+        }
+
+        spec->cvt[spec->num_cvts] = nid;
+        spec->num_cvts++;
+
+        return 0;
+}
+
+static int hdmi_parse_codec(struct hda_codec *codec)
+{
+        hda_nid_t nid;
+        int i, nodes;
+
+        nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid);
+        if (!nid || nodes < 0) {
+                snd_printk(KERN_WARNING "HDMI: failed to get afg sub nodes\n");
+                return -EINVAL;
+        }
+
+        for (i = 0; i < nodes; i++, nid++) {
+                unsigned int caps;
+                unsigned int type;
+
+                caps = snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP);
+                type = get_wcaps_type(caps);
+
+                if (!(caps & AC_WCAP_DIGITAL))
+                        continue;
+
+                switch (type) {
+                case AC_WID_AUD_OUT:
+                        if (hdmi_add_cvt(codec, nid) < 0)
+                                return -EINVAL;
+                        break;
+                case AC_WID_PIN:
+                        caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
+                        if (!(caps & (AC_PINCAP_HDMI | AC_PINCAP_DP)))
+                                continue;
+                        if (hdmi_add_pin(codec, nid) < 0)
+                                return -EINVAL;
+                        break;
+                }
+        }
+
+        /*
+         * G45/IbexPeak don't support EPSS: the unsolicited pin hot plug event
+         * can be lost and presence sense verb will become inaccurate if the
+         * HDA link is powered off at hot plug or hw initialization time.
+         */
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (!(snd_hda_param_read(codec, codec->afg, AC_PAR_POWER_STATE) &
+              AC_PWRST_EPSS))
+                codec->bus->power_keep_link_on = 1;
+#endif
+
+        return 0;
+}
+
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index 01a18ed475ac..88d035104cc5 100644
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/sound/pci/hda/patch_intelhdmi.c
@@ -33,605 +33,121 @@
 #include "hda_codec.h"
 #include "hda_local.h"
 
-static hda_nid_t cvt_nid;       /* audio converter */
-static hda_nid_t pin_nid;       /* HDMI output pin */
-
-#define INTEL_HDMI_EVENT_TAG            0x08
-
-struct intel_hdmi_spec {
-        struct hda_multi_out multiout;
-        struct hda_pcm pcm_rec;
-        struct hdmi_eld sink_eld;
-};
-
-struct hdmi_audio_infoframe {
-        u8 type; /* 0x84 */
-        u8 ver;  /* 0x01 */
-        u8 len;  /* 0x0a */
-
-        u8 checksum;    /* PB0 */
-        u8 CC02_CT47;   /* CC in bits 0:2, CT in 4:7 */
-        u8 SS01_SF24;
-        u8 CXT04;
-        u8 CA;
-        u8 LFEPBL01_LSV36_DM_INH7;
-        u8 reserved[5]; /* PB6 - PB10 */
-};
-
 /*
- * CEA speaker placement:
+ * The HDMI/DisplayPort configuration can be highly dynamic. A graphics device
+ * could support two independent pipes, each of them can be connected to one or
+ * more ports (DVI, HDMI or DisplayPort).
  *
- *        FLH       FCH        FRH
- *  FLW    FL  FLC   FC   FRC   FR   FRW
- *
- *                                  LFE
- *                     TC
- *
- *          RL  RLC   RC   RRC   RR
- *
- * The Left/Right Surround channel _notions_ LS/RS in SMPTE 320M corresponds to
- * CEA RL/RR; The SMPTE channel _assignment_ C/LFE is swapped to CEA LFE/FC.
- */
-enum cea_speaker_placement {
-        FL  = (1 <<  0),        /* Front Left           */
-        FC  = (1 <<  1),        /* Front Center         */
-        FR  = (1 <<  2),        /* Front Right          */
-        FLC = (1 <<  3),        /* Front Left Center    */
-        FRC = (1 <<  4),        /* Front Right Center   */
-        RL  = (1 <<  5),        /* Rear Left            */
-        RC  = (1 <<  6),        /* Rear Center          */
-        RR  = (1 <<  7),        /* Rear Right           */
-        RLC = (1 <<  8),        /* Rear Left Center     */
-        RRC = (1 <<  9),        /* Rear Right Center    */
-        LFE = (1 << 10),        /* Low Frequency Effect */
-        FLW = (1 << 11),        /* Front Left Wide      */
-        FRW = (1 << 12),        /* Front Right Wide     */
-        FLH = (1 << 13),        /* Front Left High      */
-        FCH = (1 << 14),        /* Front Center High    */
-        FRH = (1 << 15),        /* Front Right High     */
-        TC  = (1 << 16),        /* Top Center           */
-};
-
-/*
- * ELD SA bits in the CEA Speaker Allocation data block
+ * The HDA correspondence of pipes/ports are converter/pin nodes.
  */
-static int eld_speaker_allocation_bits[] = {
-        [0] = FL | FR,
-        [1] = LFE,
-        [2] = FC,
-        [3] = RL | RR,
-        [4] = RC,
-        [5] = FLC | FRC,
-        [6] = RLC | RRC,
-        /* the following are not defined in ELD yet */
-        [7] = FLW | FRW,
-        [8] = FLH | FRH,
-        [9] = TC,
-        [10] = FCH,
-};
+#define MAX_HDMI_CVTS   2
+#define MAX_HDMI_PINS   3
 
-struct cea_channel_speaker_allocation {
-        int ca_index;
-        int speakers[8];
+#include "patch_hdmi.c"
 
-        /* derived values, just for convenience */
-        int channels;
-        int spk_mask;
+static char *intel_hdmi_pcm_names[MAX_HDMI_CVTS] = {
+        "INTEL HDMI 0",
+        "INTEL HDMI 1",
 };
 
 /*
- * This is an ordered list!
- *
- * The preceding ones have better chances to be selected by
- * hdmi_setup_channel_allocation().
- */
-static struct cea_channel_speaker_allocation channel_allocations[] = {
-/*                        channel:   8     7    6    5    4     3    2    1  */
-{ .ca_index = 0x00,  .speakers = {   0,    0,   0,   0,   0,    0,  FR,  FL } },
-                                 /* 2.1 */
-{ .ca_index = 0x01,  .speakers = {   0,    0,   0,   0,   0,  LFE,  FR,  FL } },
-                                 /* Dolby Surround */
-{ .ca_index = 0x02,  .speakers = {   0,    0,   0,   0,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x03,  .speakers = {   0,    0,   0,   0,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x04,  .speakers = {   0,    0,   0,  RC,   0,    0,  FR,  FL } },
-{ .ca_index = 0x05,  .speakers = {   0,    0,   0,  RC,   0,  LFE,  FR,  FL } },
-{ .ca_index = 0x06,  .speakers = {   0,    0,   0,  RC,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x07,  .speakers = {   0,    0,   0,  RC,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x08,  .speakers = {   0,    0,  RR,  RL,   0,    0,  FR,  FL } },
-{ .ca_index = 0x09,  .speakers = {   0,    0,  RR,  RL,   0,  LFE,  FR,  FL } },
-{ .ca_index = 0x0a,  .speakers = {   0,    0,  RR,  RL,  FC,    0,  FR,  FL } },
-                                 /* 5.1 */
-{ .ca_index = 0x0b,  .speakers = {   0,    0,  RR,  RL,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x0c,  .speakers = {   0,   RC,  RR,  RL,   0,    0,  FR,  FL } },
-{ .ca_index = 0x0d,  .speakers = {   0,   RC,  RR,  RL,   0,  LFE,  FR,  FL } },
-{ .ca_index = 0x0e,  .speakers = {   0,   RC,  RR,  RL,  FC,    0,  FR,  FL } },
-                                 /* 6.1 */
-{ .ca_index = 0x0f,  .speakers = {   0,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x10,  .speakers = { RRC,  RLC,  RR,  RL,   0,    0,  FR,  FL } },
-{ .ca_index = 0x11,  .speakers = { RRC,  RLC,  RR,  RL,   0,  LFE,  FR,  FL } },
-{ .ca_index = 0x12,  .speakers = { RRC,  RLC,  RR,  RL,  FC,    0,  FR,  FL } },
-                                 /* 7.1 */
-{ .ca_index = 0x13,  .speakers = { RRC,  RLC,  RR,  RL,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x14,  .speakers = { FRC,  FLC,   0,   0,   0,    0,  FR,  FL } },
-{ .ca_index = 0x15,  .speakers = { FRC,  FLC,   0,   0,   0,  LFE,  FR,  FL } },
-{ .ca_index = 0x16,  .speakers = { FRC,  FLC,   0,   0,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x17,  .speakers = { FRC,  FLC,   0,   0,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x18,  .speakers = { FRC,  FLC,   0,  RC,   0,    0,  FR,  FL } },
-{ .ca_index = 0x19,  .speakers = { FRC,  FLC,   0,  RC,   0,  LFE,  FR,  FL } },
-{ .ca_index = 0x1a,  .speakers = { FRC,  FLC,   0,  RC,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x1b,  .speakers = { FRC,  FLC,   0,  RC,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x1c,  .speakers = { FRC,  FLC,  RR,  RL,   0,    0,  FR,  FL } },
-{ .ca_index = 0x1d,  .speakers = { FRC,  FLC,  RR,  RL,   0,  LFE,  FR,  FL } },
-{ .ca_index = 0x1e,  .speakers = { FRC,  FLC,  RR,  RL,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x1f,  .speakers = { FRC,  FLC,  RR,  RL,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x20,  .speakers = {   0,  FCH,  RR,  RL,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x21,  .speakers = {   0,  FCH,  RR,  RL,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x22,  .speakers = {  TC,    0,  RR,  RL,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x23,  .speakers = {  TC,    0,  RR,  RL,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x24,  .speakers = { FRH,  FLH,  RR,  RL,   0,    0,  FR,  FL } },
-{ .ca_index = 0x25,  .speakers = { FRH,  FLH,  RR,  RL,   0,  LFE,  FR,  FL } },
-{ .ca_index = 0x26,  .speakers = { FRW,  FLW,  RR,  RL,   0,    0,  FR,  FL } },
-{ .ca_index = 0x27,  .speakers = { FRW,  FLW,  RR,  RL,   0,  LFE,  FR,  FL } },
-{ .ca_index = 0x28,  .speakers = {  TC,   RC,  RR,  RL,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x29,  .speakers = {  TC,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x2a,  .speakers = { FCH,   RC,  RR,  RL,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x2b,  .speakers = { FCH,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x2c,  .speakers = {  TC,  FCH,  RR,  RL,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x2d,  .speakers = {  TC,  FCH,  RR,  RL,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x2e,  .speakers = { FRH,  FLH,  RR,  RL,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x2f,  .speakers = { FRH,  FLH,  RR,  RL,  FC,  LFE,  FR,  FL } },
-{ .ca_index = 0x30,  .speakers = { FRW,  FLW,  RR,  RL,  FC,    0,  FR,  FL } },
-{ .ca_index = 0x31,  .speakers = { FRW,  FLW,  RR,  RL,  FC,  LFE,  FR,  FL } },
-};
-
-/*
- * HDMI routines
- */
-
-#ifdef BE_PARANOID
-static void hdmi_get_dip_index(struct hda_codec *codec, hda_nid_t nid,
-                                int *packet_index, int *byte_index)
-{
-        int val;
-
-        val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_INDEX, 0);
-
-        *packet_index = val >> 5;
-        *byte_index = val & 0x1f;
-}
-#endif
-
-static void hdmi_set_dip_index(struct hda_codec *codec, hda_nid_t nid,
-                                int packet_index, int byte_index)
-{
-        int val;
-
-        val = (packet_index << 5) | (byte_index & 0x1f);
-
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_HDMI_DIP_INDEX, val);
-}
-
-static void hdmi_write_dip_byte(struct hda_codec *codec, hda_nid_t nid,
-                                unsigned char val)
-{
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_HDMI_DIP_DATA, val);
-}
-
-static void hdmi_enable_output(struct hda_codec *codec)
-{
-        /* Unmute */
-        if (get_wcaps(codec, pin_nid) & AC_WCAP_OUT_AMP)
-                snd_hda_codec_write(codec, pin_nid, 0,
-                                AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
-        /* Enable pin out */
-        snd_hda_codec_write(codec, pin_nid, 0,
-                            AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-}
-
-/*
- * Enable Audio InfoFrame Transmission
- */
-static void hdmi_start_infoframe_trans(struct hda_codec *codec)
-{
-        hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
-        snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,
-                                                AC_DIPXMIT_BEST);
-}
-
-/*
- * Disable Audio InfoFrame Transmission
- */
-static void hdmi_stop_infoframe_trans(struct hda_codec *codec)
-{
-        hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
-        snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,
-                                                AC_DIPXMIT_DISABLE);
-}
-
-static int hdmi_get_channel_count(struct hda_codec *codec)
-{
-        return 1 + snd_hda_codec_read(codec, cvt_nid, 0,
-                                        AC_VERB_GET_CVT_CHAN_COUNT, 0);
-}
-
-static void hdmi_set_channel_count(struct hda_codec *codec, int chs)
-{
-        snd_hda_codec_write(codec, cvt_nid, 0,
-                                        AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);
-
-        if (chs != hdmi_get_channel_count(codec))
-                snd_printd(KERN_INFO "HDMI channel count: expect %d, get %d\n",
-                                        chs, hdmi_get_channel_count(codec));
-}
-
-static void hdmi_debug_channel_mapping(struct hda_codec *codec)
-{
-#ifdef CONFIG_SND_DEBUG_VERBOSE
-        int i;
-        int slot;
-
-        for (i = 0; i < 8; i++) {
-                slot = snd_hda_codec_read(codec, cvt_nid, 0,
-                                                AC_VERB_GET_HDMI_CHAN_SLOT, i);
-                printk(KERN_DEBUG "HDMI: ASP channel %d => slot %d\n",
-                                                slot >> 4, slot & 0x7);
-        }
-#endif
-}
-
-static void hdmi_parse_eld(struct hda_codec *codec)
-{
-        struct intel_hdmi_spec *spec = codec->spec;
-        struct hdmi_eld *eld = &spec->sink_eld;
-
-        if (!snd_hdmi_get_eld(eld, codec, pin_nid))
-                snd_hdmi_show_eld(eld);
-}
-
-
-/*
- * Audio InfoFrame routines
- */
-
-static void hdmi_debug_dip_size(struct hda_codec *codec)
-{
-#ifdef CONFIG_SND_DEBUG_VERBOSE
-        int i;
-        int size;
-
-        size = snd_hdmi_get_eld_size(codec, pin_nid);
-        printk(KERN_DEBUG "HDMI: ELD buf size is %d\n", size);
-
-        for (i = 0; i < 8; i++) {
-                size = snd_hda_codec_read(codec, pin_nid, 0,
-                                                AC_VERB_GET_HDMI_DIP_SIZE, i);
-                printk(KERN_DEBUG "HDMI: DIP GP[%d] buf size is %d\n", i, size);
-        }
-#endif
-}
-
-static void hdmi_clear_dip_buffers(struct hda_codec *codec)
-{
-#ifdef BE_PARANOID
-        int i, j;
-        int size;
-        int pi, bi;
-        for (i = 0; i < 8; i++) {
-                size = snd_hda_codec_read(codec, pin_nid, 0,
-                                                AC_VERB_GET_HDMI_DIP_SIZE, i);
-                if (size == 0)
-                        continue;
-
-                hdmi_set_dip_index(codec, pin_nid, i, 0x0);
-                for (j = 1; j < 1000; j++) {
-                        hdmi_write_dip_byte(codec, pin_nid, 0x0);
-                        hdmi_get_dip_index(codec, pin_nid, &pi, &bi);
-                        if (pi != i)
-                                snd_printd(KERN_INFO "dip index %d: %d != %d\n",
-                                                bi, pi, i);
-                        if (bi == 0) /* byte index wrapped around */
-                                break;
-                }
-                snd_printd(KERN_INFO
-                        "HDMI: DIP GP[%d] buf reported size=%d, written=%d\n",
-                        i, size, j);
-        }
-#endif
-}
-
-static void hdmi_fill_audio_infoframe(struct hda_codec *codec,
-                                        struct hdmi_audio_infoframe *ai)
-{
-        u8 *params = (u8 *)ai;
-        u8 sum = 0;
-        int i;
-
-        hdmi_debug_dip_size(codec);
-        hdmi_clear_dip_buffers(codec); /* be paranoid */
-
-        for (i = 0; i < sizeof(ai); i++)
-                sum += params[i];
-        ai->checksum = - sum;
-
-        hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
-        for (i = 0; i < sizeof(ai); i++)
-                hdmi_write_dip_byte(codec, pin_nid, params[i]);
-}
-
-/*
- * Compute derived values in channel_allocations[].
- */
-static void init_channel_allocations(void)
-{
-        int i, j;
-        struct cea_channel_speaker_allocation *p;
-
-        for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) {
-                p = channel_allocations + i;
-                p->channels = 0;
-                p->spk_mask = 0;
-                for (j = 0; j < ARRAY_SIZE(p->speakers); j++)
-                        if (p->speakers[j]) {
-                                p->channels++;
-                                p->spk_mask |= p->speakers[j];
-                        }
-        }
-}
-
-/*
- * The transformation takes two steps:
- *
- *      eld->spk_alloc => (eld_speaker_allocation_bits[]) => spk_mask
- *            spk_mask => (channel_allocations[])         => ai->CA
- *
- * TODO: it could select the wrong CA from multiple candidates.
-*/
-static int hdmi_setup_channel_allocation(struct hda_codec *codec,
-                                         struct hdmi_audio_infoframe *ai)
-{
-        struct intel_hdmi_spec *spec = codec->spec;
-        struct hdmi_eld *eld = &spec->sink_eld;
-        int i;
-        int spk_mask = 0;
-        int channels = 1 + (ai->CC02_CT47 & 0x7);
-        char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
-
-        /*
-         * CA defaults to 0 for basic stereo audio
-         */
-        if (channels <= 2)
-                return 0;
-
-        /*
-         * HDMI sink's ELD info cannot always be retrieved for now, e.g.
-         * in console or for audio devices. Assume the highest speakers
-         * configuration, to _not_ prohibit multi-channel audio playback.
-         */
-        if (!eld->spk_alloc)
-                eld->spk_alloc = 0xffff;
-
-        /*
-         * expand ELD's speaker allocation mask
-         *
-         * ELD tells the speaker mask in a compact(paired) form,
-         * expand ELD's notions to match the ones used by Audio InfoFrame.
-         */
-        for (i = 0; i < ARRAY_SIZE(eld_speaker_allocation_bits); i++) {
-                if (eld->spk_alloc & (1 << i))
-                        spk_mask |= eld_speaker_allocation_bits[i];
-        }
-
-        /* search for the first working match in the CA table */
-        for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) {
-                if (channels == channel_allocations[i].channels &&
-                    (spk_mask & channel_allocations[i].spk_mask) ==
-                                channel_allocations[i].spk_mask) {
-                        ai->CA = channel_allocations[i].ca_index;
-                        break;
-                }
-        }
-
-        snd_print_channel_allocation(eld->spk_alloc, buf, sizeof(buf));
-        snd_printdd(KERN_INFO
-                        "HDMI: select CA 0x%x for %d-channel allocation: %s\n",
-                        ai->CA, channels, buf);
-
-        return ai->CA;
-}
-
-static void hdmi_setup_channel_mapping(struct hda_codec *codec,
-                                        struct hdmi_audio_infoframe *ai)
-{
-        int i;
-
-        if (!ai->CA)
-                return;
-
-        /*
-         * TODO: adjust channel mapping if necessary
-         * ALSA sequence is front/surr/clfe/side?
-         */
-
-        for (i = 0; i < 8; i++)
-                snd_hda_codec_write(codec, cvt_nid, 0,
-                                    AC_VERB_SET_HDMI_CHAN_SLOT,
-                                    (i << 4) | i);
-
-        hdmi_debug_channel_mapping(codec);
-}
-
-
-static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
-                                        struct snd_pcm_substream *substream)
-{
-        struct hdmi_audio_infoframe ai = {
-                .type           = 0x84,
-                .ver            = 0x01,
-                .len            = 0x0a,
-                .CC02_CT47      = substream->runtime->channels - 1,
-        };
-
-        hdmi_setup_channel_allocation(codec, &ai);
-        hdmi_setup_channel_mapping(codec, &ai);
-
-        hdmi_fill_audio_infoframe(codec, &ai);
-        hdmi_start_infoframe_trans(codec);
-}
-
-
-/*
- * Unsolicited events
- */
-
-static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
-{
-        int pind = !!(res & AC_UNSOL_RES_PD);
-        int eldv = !!(res & AC_UNSOL_RES_ELDV);
-
-        printk(KERN_INFO
-                "HDMI hot plug event: Presence_Detect=%d ELD_Valid=%d\n",
-                pind, eldv);
-
-        if (pind && eldv) {
-                hdmi_parse_eld(codec);
-                /* TODO: do real things about ELD */
-        }
-}
-
-static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
-{
-        int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT;
-        int cp_state = !!(res & AC_UNSOL_RES_CP_STATE);
-        int cp_ready = !!(res & AC_UNSOL_RES_CP_READY);
-
-        printk(KERN_INFO
-                "HDMI content protection event: SUBTAG=0x%x CP_STATE=%d CP_READY=%d\n",
-                subtag,
-                cp_state,
-                cp_ready);
-
-        /* TODO */
-        if (cp_state)
-                ;
-        if (cp_ready)
-                ;
-}
-
-
-static void intel_hdmi_unsol_event(struct hda_codec *codec, unsigned int res)
-{
-        int tag = res >> AC_UNSOL_RES_TAG_SHIFT;
-        int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT;
-
-        if (tag != INTEL_HDMI_EVENT_TAG) {
-                snd_printd(KERN_INFO "Unexpected HDMI event tag 0x%x\n", tag);
-                return;
-        }
-
-        if (subtag == 0)
-                hdmi_intrinsic_event(codec, res);
-        else
-                hdmi_non_intrinsic_event(codec, res);
-}
-
-/*
- * Callbacks
+ * HDMI callbacks
  */
 
-static int intel_hdmi_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        struct snd_pcm_substream *substream)
-{
-        struct intel_hdmi_spec *spec = codec->spec;
-
-        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
-}
-
-static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo,
-                                         struct hda_codec *codec,
-                                         struct snd_pcm_substream *substream)
-{
-        struct intel_hdmi_spec *spec = codec->spec;
-
-        hdmi_stop_infoframe_trans(codec);
-
-        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
-}
-
 static int intel_hdmi_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 intel_hdmi_spec *spec = codec->spec;
+        hdmi_set_channel_count(codec, hinfo->nid,
+                               substream->runtime->channels);
 
-        snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
-                                             format, substream);
+        hdmi_setup_audio_infoframe(codec, hinfo->nid, substream);
 
-        hdmi_set_channel_count(codec, substream->runtime->channels);
-
-        hdmi_setup_audio_infoframe(codec, substream);
+        hdmi_setup_stream(codec, hinfo->nid, stream_tag, format);
+        return 0;
+}
 
+static int intel_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                           struct hda_codec *codec,
+                                           struct snd_pcm_substream *substream)
+{
         return 0;
 }
 
 static struct hda_pcm_stream intel_hdmi_pcm_playback = {
         .substreams = 1,
         .channels_min = 2,
-        .channels_max = 8,
         .ops = {
-                .open    = intel_hdmi_playback_pcm_open,
-                .close   = intel_hdmi_playback_pcm_close,
-                .prepare = intel_hdmi_playback_pcm_prepare
+                .prepare = intel_hdmi_playback_pcm_prepare,
+                .cleanup = intel_hdmi_playback_pcm_cleanup,
         },
 };
 
 static int intel_hdmi_build_pcms(struct hda_codec *codec)
 {
-        struct intel_hdmi_spec *spec = codec->spec;
-        struct hda_pcm *info = &spec->pcm_rec;
+        struct hdmi_spec *spec = codec->spec;
+        struct hda_pcm *info = spec->pcm_rec;
+        int i;
 
-        codec->num_pcms = 1;
+        codec->num_pcms = spec->num_cvts;
         codec->pcm_info = info;
 
-        /* NID to query formats and rates and setup streams */
-        intel_hdmi_pcm_playback.nid = cvt_nid;
+        for (i = 0; i < codec->num_pcms; i++, info++) {
+                unsigned int chans;
+
+                chans = get_wcaps(codec, spec->cvt[i]);
+                chans = get_wcaps_channels(chans);
 
-        info->name = "INTEL HDMI";
-        info->pcm_type = HDA_PCM_TYPE_HDMI;
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = intel_hdmi_pcm_playback;
+                info->name = intel_hdmi_pcm_names[i];
+                info->pcm_type = HDA_PCM_TYPE_HDMI;
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
+                                                        intel_hdmi_pcm_playback;
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->cvt[i];
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = chans;
+        }
 
         return 0;
 }
 
 static int intel_hdmi_build_controls(struct hda_codec *codec)
 {
-        struct intel_hdmi_spec *spec = codec->spec;
+        struct hdmi_spec *spec = codec->spec;
         int err;
+        int i;
 
-        err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
-        if (err < 0)
-                return err;
+        for (i = 0; i < codec->num_pcms; i++) {
+                err = snd_hda_create_spdif_out_ctls(codec, spec->cvt[i]);
+                if (err < 0)
+                        return err;
+        }
 
         return 0;
 }
 
 static int intel_hdmi_init(struct hda_codec *codec)
 {
-        hdmi_enable_output(codec);
+        struct hdmi_spec *spec = codec->spec;
+        int i;
 
-        snd_hda_codec_write(codec, pin_nid, 0,
-                            AC_VERB_SET_UNSOLICITED_ENABLE,
-                            AC_USRSP_EN | INTEL_HDMI_EVENT_TAG);
+        for (i = 0; spec->pin[i]; i++) {
+                hdmi_enable_output(codec, spec->pin[i]);
+                snd_hda_codec_write(codec, spec->pin[i], 0,
+                                    AC_VERB_SET_UNSOLICITED_ENABLE,
+                                    AC_USRSP_EN | spec->pin[i]);
+        }
         return 0;
 }
 
 static void intel_hdmi_free(struct hda_codec *codec)
 {
-        struct intel_hdmi_spec *spec = codec->spec;
+        struct hdmi_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < spec->num_pins; i++)
+                snd_hda_eld_proc_free(codec, &spec->sink_eld[i]);
 
-        snd_hda_eld_proc_free(codec, &spec->sink_eld);
         kfree(spec);
 }
 
@@ -640,52 +156,41 @@ static struct hda_codec_ops intel_hdmi_patch_ops = {
         .free                   = intel_hdmi_free,
         .build_pcms             = intel_hdmi_build_pcms,
         .build_controls         = intel_hdmi_build_controls,
-        .unsol_event            = intel_hdmi_unsol_event,
+        .unsol_event            = hdmi_unsol_event,
 };
 
-static int do_patch_intel_hdmi(struct hda_codec *codec)
+static int patch_intel_hdmi(struct hda_codec *codec)
 {
-        struct intel_hdmi_spec *spec;
+        struct hdmi_spec *spec;
+        int i;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
 
-        spec->multiout.num_dacs = 0;      /* no analog */
-        spec->multiout.max_channels = 8;
-        spec->multiout.dig_out_nid = cvt_nid;
-
         codec->spec = spec;
+        if (hdmi_parse_codec(codec) < 0) {
+                codec->spec = NULL;
+                kfree(spec);
+                return -EINVAL;
+        }
         codec->patch_ops = intel_hdmi_patch_ops;
 
-        snd_hda_eld_proc_new(codec, &spec->sink_eld);
+        for (i = 0; i < spec->num_pins; i++)
+                snd_hda_eld_proc_new(codec, &spec->sink_eld[i], i);
 
         init_channel_allocations();
 
         return 0;
 }
 
-static int patch_intel_hdmi(struct hda_codec *codec)
-{
-        cvt_nid = 0x02;
-        pin_nid = 0x03;
-        return do_patch_intel_hdmi(codec);
-}
-
-static int patch_intel_hdmi_ibexpeak(struct hda_codec *codec)
-{
-        cvt_nid = 0x02;
-        pin_nid = 0x04;
-        return do_patch_intel_hdmi(codec);
-}
-
 static struct hda_codec_preset snd_hda_preset_intelhdmi[] = {
         { .id = 0x808629fb, .name = "G45 DEVCL",  .patch = patch_intel_hdmi },
         { .id = 0x80862801, .name = "G45 DEVBLC", .patch = patch_intel_hdmi },
         { .id = 0x80862802, .name = "G45 DEVCTG", .patch = patch_intel_hdmi },
         { .id = 0x80862803, .name = "G45 DEVELK", .patch = patch_intel_hdmi },
         { .id = 0x80862804, .name = "G45 DEVIBX", .patch = patch_intel_hdmi },
-        { .id = 0x80860054, .name = "Q57 DEVIBX", .patch = patch_intel_hdmi_ibexpeak },
+        { .id = 0x80860054, .name = "Q57 DEVIBX", .patch = patch_intel_hdmi },
         { .id = 0x10951392, .name = "SiI1392 HDMI",     .patch = patch_intel_hdmi },
         {} /* terminator */
 };
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c
index 6afdab09bab7..3c10c0b149f4 100644
--- a/sound/pci/hda/patch_nvhdmi.c
+++ b/sound/pci/hda/patch_nvhdmi.c
@@ -29,13 +29,23 @@
 #include "hda_codec.h"
 #include "hda_local.h"
 
+#define MAX_HDMI_CVTS   1
+#define MAX_HDMI_PINS   1
+
+#include "patch_hdmi.c"
+
+static char *nvhdmi_pcm_names[MAX_HDMI_CVTS] = {
+        "NVIDIA HDMI",
+};
+
 /* define below to restrict the supported rates and formats */
 /* #define LIMITED_RATE_FMT_SUPPORT */
 
-struct nvhdmi_spec {
-        struct hda_multi_out multiout;
-
-        struct hda_pcm pcm_rec;
+enum HDACodec {
+        HDA_CODEC_NVIDIA_MCP7X,
+        HDA_CODEC_NVIDIA_MCP89,
+        HDA_CODEC_NVIDIA_GT21X,
+        HDA_CODEC_INVALID
 };
 
 #define Nv_VERB_SET_Channel_Allocation          0xF79
@@ -43,15 +53,18 @@ struct nvhdmi_spec {
 #define Nv_VERB_SET_Audio_Protection_On         0xF98
 #define Nv_VERB_SET_Audio_Protection_Off        0xF99
 
-#define Nv_Master_Convert_nid   0x04
-#define Nv_Master_Pin_nid       0x05
+#define nvhdmi_master_con_nid_7x        0x04
+#define nvhdmi_master_pin_nid_7x        0x05
 
-static hda_nid_t nvhdmi_convert_nids[4] = {
+#define nvhdmi_master_con_nid_89        0x04
+#define nvhdmi_master_pin_nid_89        0x05
+
+static hda_nid_t nvhdmi_con_nids_7x[4] = {
         /*front, rear, clfe, rear_surr */
         0x6, 0x8, 0xa, 0xc,
 };
 
-static struct hda_verb nvhdmi_basic_init[] = {
+static struct hda_verb nvhdmi_basic_init_7x[] = {
         /* set audio protect on */
         { 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1},
         /* enable digital output on pin widget */
@@ -84,22 +97,60 @@ static struct hda_verb nvhdmi_basic_init[] = {
  */
 static int nvhdmi_build_controls(struct hda_codec *codec)
 {
-        struct nvhdmi_spec *spec = codec->spec;
+        struct hdmi_spec *spec = codec->spec;
         int err;
+        int i;
 
-        err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
-        if (err < 0)
-                return err;
+        if ((spec->codec_type == HDA_CODEC_NVIDIA_MCP89)
+        || (spec->codec_type == HDA_CODEC_NVIDIA_GT21X)) {
+                for (i = 0; i < codec->num_pcms; i++) {
+                        err = snd_hda_create_spdif_out_ctls(codec,
+                                                            spec->cvt[i]);
+                        if (err < 0)
+                                return err;
+                }
+        } else {
+                err = snd_hda_create_spdif_out_ctls(codec,
+                                                    spec->multiout.dig_out_nid);
+                if (err < 0)
+                        return err;
+        }
 
         return 0;
 }
 
 static int nvhdmi_init(struct hda_codec *codec)
 {
-        snd_hda_sequence_write(codec, nvhdmi_basic_init);
+        struct hdmi_spec *spec = codec->spec;
+        int i;
+        if ((spec->codec_type == HDA_CODEC_NVIDIA_MCP89)
+        || (spec->codec_type == HDA_CODEC_NVIDIA_GT21X)) {
+                for (i = 0; spec->pin[i]; i++) {
+                        hdmi_enable_output(codec, spec->pin[i]);
+                        snd_hda_codec_write(codec, spec->pin[i], 0,
+                                            AC_VERB_SET_UNSOLICITED_ENABLE,
+                                            AC_USRSP_EN | spec->pin[i]);
+                }
+        } else {
+                snd_hda_sequence_write(codec, nvhdmi_basic_init_7x);
+        }
         return 0;
 }
 
+static void nvhdmi_free(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec = codec->spec;
+        int i;
+
+        if ((spec->codec_type == HDA_CODEC_NVIDIA_MCP89)
+        || (spec->codec_type == HDA_CODEC_NVIDIA_GT21X)) {
+                for (i = 0; i < spec->num_pins; i++)
+                        snd_hda_eld_proc_free(codec, &spec->sink_eld[i]);
+        }
+
+        kfree(spec);
+}
+
 /*
  * Digital out
  */
@@ -107,25 +158,25 @@ static int nvhdmi_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
                                         struct hda_codec *codec,
                                         struct snd_pcm_substream *substream)
 {
-        struct nvhdmi_spec *spec = codec->spec;
+        struct hdmi_spec *spec = codec->spec;
         return snd_hda_multi_out_dig_open(codec, &spec->multiout);
 }
 
-static int nvhdmi_dig_playback_pcm_close_8ch(struct hda_pcm_stream *hinfo,
+static int nvhdmi_dig_playback_pcm_close_8ch_7x(struct hda_pcm_stream *hinfo,
                                         struct hda_codec *codec,
                                         struct snd_pcm_substream *substream)
 {
-        struct nvhdmi_spec *spec = codec->spec;
+        struct hdmi_spec *spec = codec->spec;
         int i;
 
-        snd_hda_codec_write(codec, Nv_Master_Convert_nid,
+        snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x,
                         0, AC_VERB_SET_CHANNEL_STREAMID, 0);
         for (i = 0; i < 4; i++) {
                 /* set the stream id */
-                snd_hda_codec_write(codec, nvhdmi_convert_nids[i], 0,
+                snd_hda_codec_write(codec, nvhdmi_con_nids_7x[i], 0,
                                 AC_VERB_SET_CHANNEL_STREAMID, 0);
                 /* set the stream format */
-                snd_hda_codec_write(codec, nvhdmi_convert_nids[i], 0,
+                snd_hda_codec_write(codec, nvhdmi_con_nids_7x[i], 0,
                                 AC_VERB_SET_STREAM_FORMAT, 0);
         }
 
@@ -136,10 +187,25 @@ static int nvhdmi_dig_playback_pcm_close_2ch(struct hda_pcm_stream *hinfo,
                                         struct hda_codec *codec,
                                         struct snd_pcm_substream *substream)
 {
-        struct nvhdmi_spec *spec = codec->spec;
+        struct hdmi_spec *spec = codec->spec;
         return snd_hda_multi_out_dig_close(codec, &spec->multiout);
 }
 
+static int nvhdmi_dig_playback_pcm_prepare_8ch_89(struct hda_pcm_stream *hinfo,
+                                        struct hda_codec *codec,
+                                        unsigned int stream_tag,
+                                        unsigned int format,
+                                        struct snd_pcm_substream *substream)
+{
+        hdmi_set_channel_count(codec, hinfo->nid,
+                               substream->runtime->channels);
+
+        hdmi_setup_audio_infoframe(codec, hinfo->nid, substream);
+
+        hdmi_setup_stream(codec, hinfo->nid, stream_tag, format);
+        return 0;
+}
+
 static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo,
                                         struct hda_codec *codec,
                                         unsigned int stream_tag,
@@ -181,29 +247,29 @@ static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo,
         /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */
         if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE))
                 snd_hda_codec_write(codec,
-                                Nv_Master_Convert_nid,
+                                nvhdmi_master_con_nid_7x,
                                 0,
                                 AC_VERB_SET_DIGI_CONVERT_1,
                                 codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff);
 
         /* set the stream id */
-        snd_hda_codec_write(codec, Nv_Master_Convert_nid, 0,
+        snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,
                         AC_VERB_SET_CHANNEL_STREAMID, (stream_tag << 4) | 0x0);
 
         /* set the stream format */
-        snd_hda_codec_write(codec, Nv_Master_Convert_nid, 0,
+        snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,
                         AC_VERB_SET_STREAM_FORMAT, format);
 
         /* turn on again (if needed) */
         /* enable and set the channel status audio/data flag */
         if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) {
                 snd_hda_codec_write(codec,
-                                Nv_Master_Convert_nid,
+                                nvhdmi_master_con_nid_7x,
                                 0,
                                 AC_VERB_SET_DIGI_CONVERT_1,
                                 codec->spdif_ctls & 0xff);
                 snd_hda_codec_write(codec,
-                                Nv_Master_Convert_nid,
+                                nvhdmi_master_con_nid_7x,
                                 0,
                                 AC_VERB_SET_DIGI_CONVERT_2, dataDCC2);
         }
@@ -220,19 +286,19 @@ static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo,
                 if (codec->spdif_status_reset &&
                 (codec->spdif_ctls & AC_DIG1_ENABLE))
                         snd_hda_codec_write(codec,
-                                nvhdmi_convert_nids[i],
+                                nvhdmi_con_nids_7x[i],
                                 0,
                                 AC_VERB_SET_DIGI_CONVERT_1,
                                 codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff);
                 /* set the stream id */
                 snd_hda_codec_write(codec,
-                                nvhdmi_convert_nids[i],
+                                nvhdmi_con_nids_7x[i],
                                 0,
                                 AC_VERB_SET_CHANNEL_STREAMID,
                                 (stream_tag << 4) | channel_id);
                 /* set the stream format */
                 snd_hda_codec_write(codec,
-                                nvhdmi_convert_nids[i],
+                                nvhdmi_con_nids_7x[i],
                                 0,
                                 AC_VERB_SET_STREAM_FORMAT,
                                 format);
@@ -241,12 +307,12 @@ static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo,
                 if (codec->spdif_status_reset &&
                 (codec->spdif_ctls & AC_DIG1_ENABLE)) {
                         snd_hda_codec_write(codec,
-                                        nvhdmi_convert_nids[i],
+                                        nvhdmi_con_nids_7x[i],
                                         0,
                                         AC_VERB_SET_DIGI_CONVERT_1,
                                         codec->spdif_ctls & 0xff);
                         snd_hda_codec_write(codec,
-                                        nvhdmi_convert_nids[i],
+                                        nvhdmi_con_nids_7x[i],
                                         0,
                                         AC_VERB_SET_DIGI_CONVERT_2, dataDCC2);
                 }
@@ -261,28 +327,47 @@ static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo,
         return 0;
 }
 
+static int nvhdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                           struct hda_codec *codec,
+                                           struct snd_pcm_substream *substream)
+{
+        return 0;
+}
+
 static int nvhdmi_dig_playback_pcm_prepare_2ch(struct hda_pcm_stream *hinfo,
                                         struct hda_codec *codec,
                                         unsigned int stream_tag,
                                         unsigned int format,
                                         struct snd_pcm_substream *substream)
 {
-        struct nvhdmi_spec *spec = codec->spec;
+        struct hdmi_spec *spec = codec->spec;
         return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
                                         format, substream);
 }
 
-static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch = {
+static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch_89 = {
+        .substreams = 1,
+        .channels_min = 2,
+        .rates = SUPPORTED_RATES,
+        .maxbps = SUPPORTED_MAXBPS,
+        .formats = SUPPORTED_FORMATS,
+        .ops = {
+                .prepare = nvhdmi_dig_playback_pcm_prepare_8ch_89,
+                .cleanup = nvhdmi_playback_pcm_cleanup,
+        },
+};
+
+static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch_7x = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 8,
-        .nid = Nv_Master_Convert_nid,
+        .nid = nvhdmi_master_con_nid_7x,
         .rates = SUPPORTED_RATES,
         .maxbps = SUPPORTED_MAXBPS,
         .formats = SUPPORTED_FORMATS,
         .ops = {
                 .open = nvhdmi_dig_playback_pcm_open,
-                .close = nvhdmi_dig_playback_pcm_close_8ch,
+                .close = nvhdmi_dig_playback_pcm_close_8ch_7x,
                 .prepare = nvhdmi_dig_playback_pcm_prepare_8ch
         },
 };
@@ -291,7 +376,7 @@ static struct hda_pcm_stream nvhdmi_pcm_digital_playback_2ch = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
-        .nid = Nv_Master_Convert_nid,
+        .nid = nvhdmi_master_con_nid_7x,
         .rates = SUPPORTED_RATES,
         .maxbps = SUPPORTED_MAXBPS,
         .formats = SUPPORTED_FORMATS,
@@ -302,10 +387,36 @@ static struct hda_pcm_stream nvhdmi_pcm_digital_playback_2ch = {
         },
 };
 
-static int nvhdmi_build_pcms_8ch(struct hda_codec *codec)
+static int nvhdmi_build_pcms_8ch_89(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec = codec->spec;
+        struct hda_pcm *info = spec->pcm_rec;
+        int i;
+
+        codec->num_pcms = spec->num_cvts;
+        codec->pcm_info = info;
+
+        for (i = 0; i < codec->num_pcms; i++, info++) {
+                unsigned int chans;
+
+                chans = get_wcaps(codec, spec->cvt[i]);
+                chans = get_wcaps_channels(chans);
+
+                info->name = nvhdmi_pcm_names[i];
+                info->pcm_type = HDA_PCM_TYPE_HDMI;
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK]
+                                        = nvhdmi_pcm_digital_playback_8ch_89;
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->cvt[i];
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = chans;
+        }
+
+        return 0;
+}
+
+static int nvhdmi_build_pcms_8ch_7x(struct hda_codec *codec)
 {
-        struct nvhdmi_spec *spec = codec->spec;
-        struct hda_pcm *info = &spec->pcm_rec;
+        struct hdmi_spec *spec = codec->spec;
+        struct hda_pcm *info = spec->pcm_rec;
 
         codec->num_pcms = 1;
         codec->pcm_info = info;
@@ -313,15 +424,15 @@ static int nvhdmi_build_pcms_8ch(struct hda_codec *codec)
         info->name = "NVIDIA HDMI";
         info->pcm_type = HDA_PCM_TYPE_HDMI;
         info->stream[SNDRV_PCM_STREAM_PLAYBACK]
-                                        = nvhdmi_pcm_digital_playback_8ch;
+                                        = nvhdmi_pcm_digital_playback_8ch_7x;
 
         return 0;
 }
 
 static int nvhdmi_build_pcms_2ch(struct hda_codec *codec)
 {
-        struct nvhdmi_spec *spec = codec->spec;
-        struct hda_pcm *info = &spec->pcm_rec;
+        struct hdmi_spec *spec = codec->spec;
+        struct hda_pcm *info = spec->pcm_rec;
 
         codec->num_pcms = 1;
         codec->pcm_info = info;
@@ -334,14 +445,17 @@ static int nvhdmi_build_pcms_2ch(struct hda_codec *codec)
         return 0;
 }
 
-static void nvhdmi_free(struct hda_codec *codec)
-{
-        kfree(codec->spec);
-}
+static struct hda_codec_ops nvhdmi_patch_ops_8ch_89 = {
+        .build_controls = nvhdmi_build_controls,
+        .build_pcms = nvhdmi_build_pcms_8ch_89,
+        .init = nvhdmi_init,
+        .free = nvhdmi_free,
+        .unsol_event = hdmi_unsol_event,
+};
 
-static struct hda_codec_ops nvhdmi_patch_ops_8ch = {
+static struct hda_codec_ops nvhdmi_patch_ops_8ch_7x = {
         .build_controls = nvhdmi_build_controls,
-        .build_pcms = nvhdmi_build_pcms_8ch,
+        .build_pcms = nvhdmi_build_pcms_8ch_7x,
         .init = nvhdmi_init,
         .free = nvhdmi_free,
 };
@@ -353,9 +467,36 @@ static struct hda_codec_ops nvhdmi_patch_ops_2ch = {
         .free = nvhdmi_free,
 };
 
-static int patch_nvhdmi_8ch(struct hda_codec *codec)
+static int patch_nvhdmi_8ch_89(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec;
+        int i;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;
+        spec->codec_type = HDA_CODEC_NVIDIA_MCP89;
+
+        if (hdmi_parse_codec(codec) < 0) {
+                codec->spec = NULL;
+                kfree(spec);
+                return -EINVAL;
+        }
+        codec->patch_ops = nvhdmi_patch_ops_8ch_89;
+
+        for (i = 0; i < spec->num_pins; i++)
+                snd_hda_eld_proc_new(codec, &spec->sink_eld[i], i);
+
+        init_channel_allocations();
+
+        return 0;
+}
+
+static int patch_nvhdmi_8ch_7x(struct hda_codec *codec)
 {
-        struct nvhdmi_spec *spec;
+        struct hdmi_spec *spec;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -365,16 +506,17 @@ static int patch_nvhdmi_8ch(struct hda_codec *codec)
 
         spec->multiout.num_dacs = 0;  /* no analog */
         spec->multiout.max_channels = 8;
-        spec->multiout.dig_out_nid = Nv_Master_Convert_nid;
+        spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x;
+        spec->codec_type = HDA_CODEC_NVIDIA_MCP7X;
 
-        codec->patch_ops = nvhdmi_patch_ops_8ch;
+        codec->patch_ops = nvhdmi_patch_ops_8ch_7x;
 
         return 0;
 }
 
 static int patch_nvhdmi_2ch(struct hda_codec *codec)
 {
-        struct nvhdmi_spec *spec;
+        struct hdmi_spec *spec;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -384,7 +526,8 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec)
 
         spec->multiout.num_dacs = 0;  /* no analog */
         spec->multiout.max_channels = 2;
-        spec->multiout.dig_out_nid = Nv_Master_Convert_nid;
+        spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x;
+        spec->codec_type = HDA_CODEC_NVIDIA_MCP7X;
 
         codec->patch_ops = nvhdmi_patch_ops_2ch;
 
@@ -395,11 +538,24 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec)
  * patch entries
  */
 static struct hda_codec_preset snd_hda_preset_nvhdmi[] = {
-        { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch },
-        { .id = 0x10de0003, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch },
-        { .id = 0x10de0005, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch },
-        { .id = 0x10de0006, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch },
-        { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi_8ch },
+        { .id = 0x10de0002, .name = "MCP77/78 HDMI",
+          .patch = patch_nvhdmi_8ch_7x },
+        { .id = 0x10de0003, .name = "MCP77/78 HDMI",
+          .patch = patch_nvhdmi_8ch_7x },
+        { .id = 0x10de0005, .name = "MCP77/78 HDMI",
+          .patch = patch_nvhdmi_8ch_7x },
+        { .id = 0x10de0006, .name = "MCP77/78 HDMI",
+          .patch = patch_nvhdmi_8ch_7x },
+        { .id = 0x10de0007, .name = "MCP79/7A HDMI",
+          .patch = patch_nvhdmi_8ch_7x },
+        { .id = 0x10de000a, .name = "GT220 HDMI",
+          .patch = patch_nvhdmi_8ch_89 },
+        { .id = 0x10de000b, .name = "GT21x HDMI",
+          .patch = patch_nvhdmi_8ch_89 },
+        { .id = 0x10de000c, .name = "MCP89 HDMI",
+          .patch = patch_nvhdmi_8ch_89 },
+        { .id = 0x10de000d, .name = "GT240 HDMI",
+          .patch = patch_nvhdmi_8ch_89 },
         { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch },
         { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch },
         {} /* terminator */
@@ -410,11 +566,15 @@ MODULE_ALIAS("snd-hda-codec-id:10de0003");
 MODULE_ALIAS("snd-hda-codec-id:10de0005");
 MODULE_ALIAS("snd-hda-codec-id:10de0006");
 MODULE_ALIAS("snd-hda-codec-id:10de0007");
+MODULE_ALIAS("snd-hda-codec-id:10de000a");
+MODULE_ALIAS("snd-hda-codec-id:10de000b");
+MODULE_ALIAS("snd-hda-codec-id:10de000c");
+MODULE_ALIAS("snd-hda-codec-id:10de000d");
 MODULE_ALIAS("snd-hda-codec-id:10de0067");
 MODULE_ALIAS("snd-hda-codec-id:10de8001");
 
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Nvidia HDMI HD-audio codec");
+MODULE_DESCRIPTION("NVIDIA HDMI HD-audio codec");
 
 static struct hda_codec_preset_list nvhdmi_list = {
         .preset = snd_hda_preset_nvhdmi,
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 70583719282b..886d8e46bb37 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -131,8 +131,10 @@ enum {
 enum {
         ALC269_BASIC,
         ALC269_QUANTA_FL1,
-        ALC269_ASUS_EEEPC_P703,
-        ALC269_ASUS_EEEPC_P901,
+        ALC269_AMIC,
+        ALC269_DMIC,
+        ALC269VB_AMIC,
+        ALC269VB_DMIC,
         ALC269_FUJITSU,
         ALC269_LIFEBOOK,
         ALC269_AUTO,
@@ -188,6 +190,8 @@ enum {
         ALC663_ASUS_MODE4,
         ALC663_ASUS_MODE5,
         ALC663_ASUS_MODE6,
+        ALC663_ASUS_MODE7,
+        ALC663_ASUS_MODE8,
         ALC272_DELL,
         ALC272_DELL_ZM1,
         ALC272_SAMSUNG_NC10,
@@ -205,9 +209,12 @@ enum {
         ALC882_ASUS_A7J,
         ALC882_ASUS_A7M,
         ALC885_MACPRO,
+        ALC885_MBA21,
         ALC885_MBP3,
         ALC885_MB5,
+        ALC885_MACMINI3,
         ALC885_IMAC24,
+        ALC885_IMAC91,
         ALC883_3ST_2ch_DIG,
         ALC883_3ST_6ch_DIG,
         ALC883_3ST_6ch,
@@ -223,6 +230,7 @@ enum {
         ALC888_ACER_ASPIRE_7730G,
         ALC883_MEDION,
         ALC883_MEDION_MD2,
+        ALC883_MEDION_WIM2160,
         ALC883_LAPTOP_EAPD,
         ALC883_LENOVO_101E_2ch,
         ALC883_LENOVO_NB0763,
@@ -334,6 +342,9 @@ struct alc_spec {
         /* hooks */
         void (*init_hook)(struct hda_codec *codec);
         void (*unsol_event)(struct hda_codec *codec, unsigned int res);
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        void (*power_hook)(struct hda_codec *codec);
+#endif
 
         /* for pin sensing */
         unsigned int sense_updated: 1;
@@ -385,6 +396,7 @@ struct alc_config_preset {
         void (*init_hook)(struct hda_codec *);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         struct hda_amp_list *loopbacks;
+        void (*power_hook)(struct hda_codec *codec);
 #endif
 };
 
@@ -400,6 +412,8 @@ static int alc_mux_enum_info(struct snd_kcontrol *kcontrol,
         unsigned int mux_idx = snd_ctl_get_ioffidx(kcontrol, &uinfo->id);
         if (mux_idx >= spec->num_mux_defs)
                 mux_idx = 0;
+        if (!spec->input_mux[mux_idx].num_items && mux_idx > 0)
+                mux_idx = 0;
         return snd_hda_input_mux_info(&spec->input_mux[mux_idx], uinfo);
 }
 
@@ -428,6 +442,8 @@ static int alc_mux_enum_put(struct snd_kcontrol *kcontrol,
 
         mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;
         imux = &spec->input_mux[mux_idx];
+        if (!imux->num_items && mux_idx > 0)
+                imux = &spec->input_mux[0];
 
         type = get_wcaps_type(get_wcaps(codec, nid));
         if (type == AC_WID_AUD_MIX) {
@@ -626,6 +642,7 @@ static int alc_pin_mode_put(struct snd_kcontrol *kcontrol,
 
 #define ALC_PIN_MODE(xname, nid, dir) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
           .info = alc_pin_mode_info, \
           .get = alc_pin_mode_get, \
           .put = alc_pin_mode_put, \
@@ -677,6 +694,7 @@ static int alc_gpio_data_put(struct snd_kcontrol *kcontrol,
 }
 #define ALC_GPIO_DATA_SWITCH(xname, nid, mask) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
           .info = alc_gpio_data_info, \
           .get = alc_gpio_data_get, \
           .put = alc_gpio_data_put, \
@@ -731,6 +749,7 @@ static int alc_spdif_ctrl_put(struct snd_kcontrol *kcontrol,
 }
 #define ALC_SPDIF_CTRL_SWITCH(xname, nid, mask) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
           .info = alc_spdif_ctrl_info, \
           .get = alc_spdif_ctrl_get, \
           .put = alc_spdif_ctrl_put, \
@@ -784,6 +803,7 @@ static int alc_eapd_ctrl_put(struct snd_kcontrol *kcontrol,
 
 #define ALC_EAPD_CTRL_SWITCH(xname, nid, mask) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
           .info = alc_eapd_ctrl_info, \
           .get = alc_eapd_ctrl_get, \
           .put = alc_eapd_ctrl_put, \
@@ -830,27 +850,6 @@ static void add_verb(struct alc_spec *spec, const struct hda_verb *verb)
         spec->init_verbs[spec->num_init_verbs++] = verb;
 }
 
-#ifdef CONFIG_PROC_FS
-/*
- * hook for proc
- */
-static void print_realtek_coef(struct snd_info_buffer *buffer,
-                               struct hda_codec *codec, hda_nid_t nid)
-{
-        int coeff;
-
-        if (nid != 0x20)
-                return;
-        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);
-}
-#else
-#define print_realtek_coef      NULL
-#endif
-
 /*
  * set up from the preset table
  */
@@ -897,6 +896,7 @@ static void setup_preset(struct hda_codec *codec,
         spec->unsol_event = preset->unsol_event;
         spec->init_hook = preset->init_hook;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->power_hook = preset->power_hook;
         spec->loopback.amplist = preset->loopbacks;
 #endif
 
@@ -961,18 +961,12 @@ static void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid,
 static void alc_automute_pin(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        unsigned int present, pincap;
         unsigned int nid = spec->autocfg.hp_pins[0];
         int i;
 
         if (!nid)
                 return;
-        pincap = snd_hda_query_pin_caps(codec, nid);
-        if (pincap & AC_PINCAP_TRIG_REQ) /* need trigger? */
-                snd_hda_codec_read(codec, nid, 0, AC_VERB_SET_PIN_SENSE, 0);
-        present = snd_hda_codec_read(codec, nid, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0);
-        spec->jack_present = (present & AC_PINSENSE_PRESENCE) != 0;
+        spec->jack_present = snd_hda_jack_detect(codec, nid);
         for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) {
                 nid = spec->autocfg.speaker_pins[i];
                 if (!nid)
@@ -1012,9 +1006,7 @@ static void alc_mic_automute(struct hda_codec *codec)
 
         cap_nid = spec->capsrc_nids ? spec->capsrc_nids[0] : spec->adc_nids[0];
 
-        present = snd_hda_codec_read(codec, spec->ext_mic.pin, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0);
-        present &= AC_PINSENSE_PRESENCE;
+        present = snd_hda_jack_detect(codec, spec->ext_mic.pin);
         if (present) {
                 alive = &spec->ext_mic;
                 dead = &spec->int_mic;
@@ -1093,6 +1085,16 @@ static void alc889_coef_init(struct hda_codec *codec)
         snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_PROC_COEF, tmp|0x2010);
 }
 
+/* turn on/off EAPD control (only if available) */
+static void set_eapd(struct hda_codec *codec, hda_nid_t nid, int on)
+{
+        if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN)
+                return;
+        if (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_EAPD)
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_EAPD_BTLENABLE,
+                                    on ? 2 : 0);
+}
+
 static void alc_auto_init_amp(struct hda_codec *codec, int type)
 {
         unsigned int tmp;
@@ -1110,25 +1112,22 @@ static void alc_auto_init_amp(struct hda_codec *codec, int type)
         case ALC_INIT_DEFAULT:
                 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);
+                        set_eapd(codec, 0x0f, 1);
+                        set_eapd(codec, 0x10, 1);
                         break;
                 case 0x10ec0262:
                 case 0x10ec0267:
                 case 0x10ec0268:
                 case 0x10ec0269:
+                case 0x10ec0270:
                 case 0x10ec0272:
                 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);
+                        set_eapd(codec, 0x14, 1);
+                        set_eapd(codec, 0x15, 1);
                         break;
                 }
                 switch (codec->vendor_id) {
@@ -1155,6 +1154,7 @@ static void alc_auto_init_amp(struct hda_codec *codec, int type)
                 case 0x10ec0888:
                         alc888_coef_init(codec);
                         break;
+#if 0 /* XXX: This may cause the silent output on speaker on some machines */
                 case 0x10ec0267:
                 case 0x10ec0268:
                         snd_hda_codec_write(codec, 0x20, 0,
@@ -1167,6 +1167,7 @@ static void alc_auto_init_amp(struct hda_codec *codec, int type)
                                             AC_VERB_SET_PROC_COEF,
                                             tmp | 0x3000);
                         break;
+#endif /* XXX */
                 }
                 break;
         }
@@ -1230,6 +1231,8 @@ static void alc_init_auto_mic(struct hda_codec *codec)
                         return; /* invalid entry */
                 }
         }
+        if (!ext || !fixed)
+                return;
         if (!(get_wcaps(codec, ext) & AC_WCAP_UNSOL_CAP))
                 return; /* no unsol support */
         snd_printdd("realtek: Enable auto-mic switch on NID 0x%x/0x%x\n",
@@ -1256,7 +1259,7 @@ static void alc_init_auto_mic(struct hda_codec *codec)
  */
 static int alc_subsystem_id(struct hda_codec *codec,
                             hda_nid_t porta, hda_nid_t porte,
-                            hda_nid_t portd)
+                            hda_nid_t portd, hda_nid_t porti)
 {
         unsigned int ass, tmp, i;
         unsigned nid;
@@ -1282,7 +1285,7 @@ static int alc_subsystem_id(struct hda_codec *codec,
         snd_printd("realtek: No valid SSID, "
                    "checking pincfg 0x%08x for NID 0x%x\n",
                    ass, nid);
-        if (!(ass & 1) && !(ass & 0x100000))
+        if (!(ass & 1))
                 return 0;
         if ((ass >> 30) != 1)   /* no physical connection */
                 return 0;
@@ -1342,6 +1345,8 @@ do_sku:
                         nid = porte;
                 else if (tmp == 2)
                         nid = portd;
+                else if (tmp == 3)
+                        nid = porti;
                 else
                         return 1;
                 for (i = 0; i < spec->autocfg.line_outs; i++)
@@ -1356,9 +1361,10 @@ do_sku:
 }
 
 static void alc_ssid_check(struct hda_codec *codec,
-                           hda_nid_t porta, hda_nid_t porte, hda_nid_t portd)
+                           hda_nid_t porta, hda_nid_t porte,
+                           hda_nid_t portd, hda_nid_t porti)
 {
-        if (!alc_subsystem_id(codec, porta, porte, portd)) {
+        if (!alc_subsystem_id(codec, porta, porte, portd, porti)) {
                 struct alc_spec *spec = codec->spec;
                 snd_printd("realtek: "
                            "Enable default setup for auto mode as fallback\n");
@@ -1384,22 +1390,42 @@ struct alc_fixup {
 
 static void alc_pick_fixup(struct hda_codec *codec,
                            const struct snd_pci_quirk *quirk,
-                           const struct alc_fixup *fix)
+                           const struct alc_fixup *fix,
+                           int pre_init)
 {
         const struct alc_pincfg *cfg;
 
         quirk = snd_pci_quirk_lookup(codec->bus->pci, quirk);
         if (!quirk)
                 return;
-
         fix += quirk->value;
         cfg = fix->pins;
-        if (cfg) {
+        if (pre_init && cfg) {
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+                snd_printdd(KERN_INFO "hda_codec: %s: Apply pincfg for %s\n",
+                            codec->chip_name, quirk->name);
+#endif
                 for (; cfg->nid; cfg++)
                         snd_hda_codec_set_pincfg(codec, cfg->nid, cfg->val);
         }
-        if (fix->verbs)
+        if (!pre_init && fix->verbs) {
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+                snd_printdd(KERN_INFO "hda_codec: %s: Apply fix-verbs for %s\n",
+                            codec->chip_name, quirk->name);
+#endif
                 add_verb(codec->spec, fix->verbs);
+        }
+}
+
+static int alc_read_coef_idx(struct hda_codec *codec,
+                        unsigned int coef_idx)
+{
+        unsigned int val;
+        snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX,
+                                coef_idx);
+        val = snd_hda_codec_read(codec, 0x20, 0,
+                                AC_VERB_GET_PROC_COEF, 0);
+        return val;
 }
 
 /*
@@ -1513,7 +1539,7 @@ static struct hda_verb alc888_fujitsu_xa3530_verbs[] = {
 static void alc_automute_amp(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        unsigned int val, mute, pincap;
+        unsigned int mute;
         hda_nid_t nid;
         int i;
 
@@ -1522,13 +1548,7 @@ static void alc_automute_amp(struct hda_codec *codec)
                 nid = spec->autocfg.hp_pins[i];
                 if (!nid)
                         break;
-                pincap = snd_hda_query_pin_caps(codec, nid);
-                if (pincap & AC_PINCAP_TRIG_REQ) /* need trigger? */
-                        snd_hda_codec_read(codec, nid, 0,
-                                           AC_VERB_SET_PIN_SENSE, 0);
-                val = snd_hda_codec_read(codec, nid, 0,
-                                         AC_VERB_GET_PIN_SENSE, 0);
-                if (val & AC_PINSENSE_PRESENCE) {
+                if (snd_hda_jack_detect(codec, nid)) {
                         spec->jack_present = 1;
                         break;
                 }
@@ -1611,6 +1631,11 @@ static struct hda_verb alc888_acer_aspire_4930g_verbs[] = {
  */
 
 static struct hda_verb alc888_acer_aspire_6530g_verbs[] = {
+/* Route to built-in subwoofer as well as speakers */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
 /* Bias voltage on for external mic port */
         {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN | PIN_VREF80},
 /* Front Mic: set to PIN_IN (empty by default) */
@@ -1622,10 +1647,12 @@ static struct hda_verb alc888_acer_aspire_6530g_verbs[] = {
 /* Enable speaker output */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
 /* Enable headphone output */
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | PIN_HP},
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
         { }
 };
 
@@ -1665,9 +1692,6 @@ static struct hda_verb alc889_acer_aspire_8930g_verbs[] = {
 /*  some bit here disables the other DACs. Init=0x4900 */
         {0x20, AC_VERB_SET_COEF_INDEX, 0x08},
         {0x20, AC_VERB_SET_PROC_COEF, 0x0000},
-/* Enable amplifiers */
-        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
-        {0x15, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
 /* DMIC fix
  * This laptop has a stereo digital microphone. The mics are only 1cm apart
  * which makes the stereo useless. However, either the mic or the ALC889
@@ -1780,12 +1804,33 @@ static struct snd_kcontrol_new alc888_base_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new alc889_acer_aspire_8930g_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,
+                HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("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),
+        { } /* end */
+};
+
+
 static void alc888_acer_aspire_4930g_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[1] = 0x16;
+        spec->autocfg.speaker_pins[2] = 0x17;
 }
 
 static void alc888_acer_aspire_6530g_setup(struct hda_codec *codec)
@@ -2401,6 +2446,8 @@ static const char *alc_slave_sws[] = {
         "Speaker Playback Switch",
         "Mono Playback Switch",
         "IEC958 Playback Switch",
+        "Line-Out Playback Switch",
+        "PCM Playback Switch",
         NULL,
 };
 
@@ -2408,20 +2455,34 @@ static const char *alc_slave_sws[] = {
  * build control elements
  */
 
+#define NID_MAPPING             (-1)
+
+#define SUBDEV_SPEAKER_         (0 << 6)
+#define SUBDEV_HP_              (1 << 6)
+#define SUBDEV_LINE_            (2 << 6)
+#define SUBDEV_SPEAKER(x)       (SUBDEV_SPEAKER_ | ((x) & 0x3f))
+#define SUBDEV_HP(x)            (SUBDEV_HP_ | ((x) & 0x3f))
+#define SUBDEV_LINE(x)          (SUBDEV_LINE_ | ((x) & 0x3f))
+
 static void alc_free_kctls(struct hda_codec *codec);
 
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
 /* additional beep mixers; the actual parameters are overwritten at build */
 static struct snd_kcontrol_new alc_beep_mixer[] = {
         HDA_CODEC_VOLUME("Beep Playback Volume", 0, 0, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0, 0, HDA_INPUT),
+        HDA_CODEC_MUTE_BEEP("Beep Playback Switch", 0, 0, HDA_INPUT),
         { } /* end */
 };
+#endif
 
 static int alc_build_controls(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        int err;
-        int i;
+        struct snd_kcontrol *kctl;
+        struct snd_kcontrol_new *knew;
+        int i, j, err;
+        unsigned int u;
+        hda_nid_t nid;
 
         for (i = 0; i < spec->num_mixers; i++) {
                 err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
@@ -2452,6 +2513,7 @@ static int alc_build_controls(struct hda_codec *codec)
                         return err;
         }
 
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
         /* create beep controls if needed */
         if (spec->beep_amp) {
                 struct snd_kcontrol_new *knew;
@@ -2461,11 +2523,12 @@ static int alc_build_controls(struct hda_codec *codec)
                         if (!kctl)
                                 return -ENOMEM;
                         kctl->private_value = spec->beep_amp;
-                        err = snd_hda_ctl_add(codec, kctl);
+                        err = snd_hda_ctl_add(codec, 0, kctl);
                         if (err < 0)
                                 return err;
                 }
         }
+#endif
 
         /* if we have no master control, let's create it */
         if (!spec->no_analog &&
@@ -2486,7 +2549,77 @@ static int alc_build_controls(struct hda_codec *codec)
                         return err;
         }
 
+        /* assign Capture Source enums to NID */
+        kctl = snd_hda_find_mixer_ctl(codec, "Capture Source");
+        if (!kctl)
+                kctl = snd_hda_find_mixer_ctl(codec, "Input Source");
+        for (i = 0; kctl && i < kctl->count; i++) {
+                hda_nid_t *nids = spec->capsrc_nids;
+                if (!nids)
+                        nids = spec->adc_nids;
+                err = snd_hda_add_nid(codec, kctl, i, nids[i]);
+                if (err < 0)
+                        return err;
+        }
+        if (spec->cap_mixer) {
+                const char *kname = kctl ? kctl->id.name : NULL;
+                for (knew = spec->cap_mixer; knew->name; knew++) {
+                        if (kname && strcmp(knew->name, kname) == 0)
+                                continue;
+                        kctl = snd_hda_find_mixer_ctl(codec, knew->name);
+                        for (i = 0; kctl && i < kctl->count; i++) {
+                                err = snd_hda_add_nid(codec, kctl, i,
+                                                      spec->adc_nids[i]);
+                                if (err < 0)
+                                        return err;
+                        }
+                }
+        }
+
+        /* other nid->control mapping */
+        for (i = 0; i < spec->num_mixers; i++) {
+                for (knew = spec->mixers[i]; knew->name; knew++) {
+                        if (knew->iface != NID_MAPPING)
+                                continue;
+                        kctl = snd_hda_find_mixer_ctl(codec, knew->name);
+                        if (kctl == NULL)
+                                continue;
+                        u = knew->subdevice;
+                        for (j = 0; j < 4; j++, u >>= 8) {
+                                nid = u & 0x3f;
+                                if (nid == 0)
+                                        continue;
+                                switch (u & 0xc0) {
+                                case SUBDEV_SPEAKER_:
+                                        nid = spec->autocfg.speaker_pins[nid];
+                                        break;
+                                case SUBDEV_LINE_:
+                                        nid = spec->autocfg.line_out_pins[nid];
+                                        break;
+                                case SUBDEV_HP_:
+                                        nid = spec->autocfg.hp_pins[nid];
+                                        break;
+                                default:
+                                        continue;
+                                }
+                                err = snd_hda_add_nid(codec, kctl, 0, nid);
+                                if (err < 0)
+                                        return err;
+                        }
+                        u = knew->private_value;
+                        for (j = 0; j < 4; j++, u >>= 8) {
+                                nid = u & 0xff;
+                                if (nid == 0)
+                                        continue;
+                                err = snd_hda_add_nid(codec, kctl, 0, nid);
+                                if (err < 0)
+                                        return err;
+                        }
+                }
+        }
+
         alc_free_kctls(codec); /* no longer needed */
+
         return 0;
 }
 
@@ -2779,8 +2912,7 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x18);
         bits = present ? HDA_AMP_MUTE : 0;
         snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits);
 }
@@ -3480,7 +3612,7 @@ static int alc_build_pcms(struct hda_codec *codec)
         snprintf(spec->stream_name_analog, sizeof(spec->stream_name_analog),
                  "%s Analog", codec->chip_name);
         info->name = spec->stream_name_analog;
-        
+
         if (spec->stream_analog_playback) {
                 if (snd_BUG_ON(!spec->multiout.dac_nids))
                         return -EINVAL;
@@ -3570,6 +3702,11 @@ static int alc_build_pcms(struct hda_codec *codec)
         return 0;
 }
 
+static inline void alc_shutup(struct hda_codec *codec)
+{
+        snd_hda_shutup_pins(codec);
+}
+
 static void alc_free_kctls(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -3590,11 +3727,48 @@ static void alc_free(struct hda_codec *codec)
         if (!spec)
                 return;
 
+        alc_shutup(codec);
         alc_free_kctls(codec);
         kfree(spec);
         snd_hda_detach_beep_device(codec);
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static void alc_power_eapd(struct hda_codec *codec)
+{
+        /* We currently only handle front, HP */
+        switch (codec->vendor_id) {
+        case 0x10ec0260:
+                set_eapd(codec, 0x0f, 0);
+                set_eapd(codec, 0x10, 0);
+                break;
+        case 0x10ec0262:
+        case 0x10ec0267:
+        case 0x10ec0268:
+        case 0x10ec0269:
+        case 0x10ec0270:
+        case 0x10ec0272:
+        case 0x10ec0660:
+        case 0x10ec0662:
+        case 0x10ec0663:
+        case 0x10ec0862:
+        case 0x10ec0889:
+                set_eapd(codec, 0x14, 0);
+                set_eapd(codec, 0x15, 0);
+                break;
+        }
+}
+
+static int alc_suspend(struct hda_codec *codec, pm_message_t state)
+{
+        struct alc_spec *spec = codec->spec;
+        alc_shutup(codec);
+        if (spec && spec->power_hook)
+                spec->power_hook(codec);
+        return 0;
+}
+#endif
+
 #ifdef SND_HDA_NEEDS_RESUME
 static int alc_resume(struct hda_codec *codec)
 {
@@ -3617,8 +3791,10 @@ static struct hda_codec_ops alc_patch_ops = {
         .resume = alc_resume,
 #endif
 #ifdef CONFIG_SND_HDA_POWER_SAVE
+        .suspend = alc_suspend,
         .check_power_status = alc_check_power_status,
 #endif
+        .reboot_notify = alc_shutup,
 };
 
 
@@ -3775,6 +3951,7 @@ static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol,
 #define PIN_CTL_TEST(xname,nid) {                       \
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
                         .name = xname,                 \
+                        .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
                         .info = alc_test_pin_ctl_info, \
                         .get = alc_test_pin_ctl_get,   \
                         .put = alc_test_pin_ctl_put,   \
@@ -3784,6 +3961,7 @@ static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol,
 #define PIN_SRC_TEST(xname,nid) {                       \
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
                         .name = xname,                 \
+                        .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
                         .info = alc_test_pin_src_info, \
                         .get = alc_test_pin_src_get,   \
                         .put = alc_test_pin_src_put,   \
@@ -3965,7 +4143,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG),
         SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_F1734),
         SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FUJITSU),
-        SND_PCI_QUIRK(0x1734, 0x10ac, "FSC", ALC880_UNIWILL),
+        SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_F1734),
         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),
@@ -4322,10 +4500,26 @@ static int add_control(struct alc_spec *spec, int type, const char *name,
         knew->name = kstrdup(name, GFP_KERNEL);
         if (!knew->name)
                 return -ENOMEM;
+        if (get_amp_nid_(val))
+                knew->subdevice = HDA_SUBDEV_AMP_FLAG;
         knew->private_value = val;
         return 0;
 }
 
+static int add_control_with_pfx(struct alc_spec *spec, int type,
+                                const char *pfx, const char *dir,
+                                const char *sfx, unsigned long val)
+{
+        char name[32];
+        snprintf(name, sizeof(name), "%s %s %s", pfx, dir, sfx);
+        return add_control(spec, type, name, val);
+}
+
+#define add_pb_vol_ctrl(spec, type, pfx, val) \
+        add_control_with_pfx(spec, type, pfx, "Playback", "Volume", val)
+#define add_pb_sw_ctrl(spec, type, pfx, val) \
+        add_control_with_pfx(spec, type, pfx, "Playback", "Switch", val)
+
 #define alc880_is_fixed_pin(nid)        ((nid) >= 0x14 && (nid) <= 0x17)
 #define alc880_fixed_pin_idx(nid)       ((nid) - 0x14)
 #define alc880_is_multi_pin(nid)        ((nid) >= 0x18)
@@ -4379,7 +4573,6 @@ static int alc880_auto_fill_dac_nids(struct alc_spec *spec,
 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"
         };
@@ -4392,26 +4585,26 @@ static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec,
                 nid = alc880_idx_to_mixer(alc880_dac_to_idx(spec->multiout.dac_nids[i]));
                 if (i == 2) {
                         /* Center/LFE */
-                        err = add_control(spec, ALC_CTL_WIDGET_VOL,
-                                          "Center Playback Volume",
+                        err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,
+                                              "Center",
                                           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",
+                        err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,
+                                              "LFE",
                                           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",
+                        err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,
+                                             "Center",
                                           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",
+                        err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,
+                                             "LFE",
                                           HDA_COMPOSE_AMP_VAL(nid, 2, 2,
                                                               HDA_INPUT));
                         if (err < 0)
@@ -4423,14 +4616,12 @@ static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec,
                                 pfx = "Speaker";
                         else
                                 pfx = chname[i];
-                        sprintf(name, "%s Playback Volume", pfx);
-                        err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                        err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,
                                           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,
+                        err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, pfx,
                                           HDA_COMPOSE_AMP_VAL(nid, 3, 2,
                                                               HDA_INPUT));
                         if (err < 0)
@@ -4446,7 +4637,6 @@ static int alc880_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin,
 {
         hda_nid_t nid;
         int err;
-        char name[32];
 
         if (!pin)
                 return 0;
@@ -4460,21 +4650,18 @@ static int alc880_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin,
                         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);
-                err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,
                                   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,
+                err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, pfx,
                                   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,
+                err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx,
                                   HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
                 if (err < 0)
                         return err;
@@ -4487,16 +4674,13 @@ 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);
-        err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+        err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, ctlname,
                           HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
         if (err < 0)
                 return err;
-        sprintf(name, "%s Playback Switch", ctlname);
-        err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+        err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname,
                           HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
         if (err < 0)
                 return err;
@@ -4634,6 +4818,25 @@ static void alc880_auto_init_analog_input(struct hda_codec *codec)
         }
 }
 
+static void alc880_auto_init_input_src(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int c;
+
+        for (c = 0; c < spec->num_adc_nids; c++) {
+                unsigned int mux_idx;
+                const struct hda_input_mux *imux;
+                mux_idx = c >= spec->num_mux_defs ? 0 : c;
+                imux = &spec->input_mux[mux_idx];
+                if (!imux->num_items && mux_idx > 0)
+                        imux = &spec->input_mux[0];
+                if (imux)
+                        snd_hda_codec_write(codec, spec->adc_nids[c], 0,
+                                            AC_VERB_SET_CONNECT_SEL,
+                                            imux->items[0].index);
+        }
+}
+
 /* 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
@@ -4700,7 +4903,7 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
         spec->num_mux_defs = 1;
         spec->input_mux = &spec->private_imux[0];
 
-        alc_ssid_check(codec, 0x15, 0x1b, 0x14);
+        alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);
 
         return 1;
 }
@@ -4712,6 +4915,7 @@ static void alc880_auto_init(struct hda_codec *codec)
         alc880_auto_init_multi_out(codec);
         alc880_auto_init_extra_out(codec);
         alc880_auto_init_analog_input(codec);
+        alc880_auto_init_input_src(codec);
         if (spec->unsol_event)
                 alc_inithook(codec);
 }
@@ -4749,6 +4953,49 @@ static void fixup_automic_adc(struct hda_codec *codec)
         spec->auto_mic = 0; /* disable auto-mic to be sure */
 }
 
+/* choose the ADC/MUX containing the input pin and initialize the setup */
+static void fixup_single_adc(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t pin = 0;
+        int i;
+
+        /* search for the input pin; there must be only one */
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                if (spec->autocfg.input_pins[i]) {
+                        pin = spec->autocfg.input_pins[i];
+                        break;
+                }
+        }
+        if (!pin)
+                return;
+
+        /* set the default connection to that pin */
+        for (i = 0; i < spec->num_adc_nids; i++) {
+                hda_nid_t cap = spec->capsrc_nids ?
+                        spec->capsrc_nids[i] : spec->adc_nids[i];
+                int idx;
+
+                idx = get_connection_index(codec, cap, pin);
+                if (idx < 0)
+                        continue;
+                /* use only this ADC */
+                if (spec->capsrc_nids)
+                        spec->capsrc_nids += i;
+                spec->adc_nids += i;
+                spec->num_adc_nids = 1;
+                /* select or unmute this route */
+                if (get_wcaps_type(get_wcaps(codec, cap)) == AC_WID_AUD_MIX) {
+                        snd_hda_codec_amp_stereo(codec, cap, HDA_INPUT, idx,
+                                                 HDA_AMP_MUTE, 0);
+                } else {
+                        snd_hda_codec_write_cache(codec, cap, 0,
+                                          AC_VERB_SET_CONNECT_SEL, idx);
+                }
+                return;
+        }
+}
+
 static void set_capture_mixer(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -4761,20 +5008,89 @@ static void set_capture_mixer(struct hda_codec *codec)
                   alc_capture_mixer3 },
         };
         if (spec->num_adc_nids > 0 && spec->num_adc_nids <= 3) {
-                int mux;
-                if (spec->auto_mic) {
-                        mux = 0;
+                int mux = 0;
+                if (spec->auto_mic)
                         fixup_automic_adc(codec);
-                } else if (spec->input_mux && spec->input_mux->num_items > 1)
-                        mux = 1;
-                else
-                        mux = 0;
+                else if (spec->input_mux) {
+                        if (spec->input_mux->num_items > 1)
+                                mux = 1;
+                        else if (spec->input_mux->num_items == 1)
+                                fixup_single_adc(codec);
+                }
                 spec->cap_mixer = caps[mux][spec->num_adc_nids - 1];
         }
 }
 
+/* fill adc_nids (and capsrc_nids) containing all active input pins */
+static void fillup_priv_adc_nids(struct hda_codec *codec, hda_nid_t *nids,
+                                 int num_nids)
+{
+        struct alc_spec *spec = codec->spec;
+        int n;
+        hda_nid_t fallback_adc = 0, fallback_cap = 0;
+
+        for (n = 0; n < num_nids; n++) {
+                hda_nid_t adc, cap;
+                hda_nid_t conn[HDA_MAX_NUM_INPUTS];
+                int nconns, i, j;
+
+                adc = nids[n];
+                if (get_wcaps_type(get_wcaps(codec, adc)) != AC_WID_AUD_IN)
+                        continue;
+                cap = adc;
+                nconns = snd_hda_get_connections(codec, cap, conn,
+                                                 ARRAY_SIZE(conn));
+                if (nconns == 1) {
+                        cap = conn[0];
+                        nconns = snd_hda_get_connections(codec, cap, conn,
+                                                         ARRAY_SIZE(conn));
+                }
+                if (nconns <= 0)
+                        continue;
+                if (!fallback_adc) {
+                        fallback_adc = adc;
+                        fallback_cap = cap;
+                }
+                for (i = 0; i < AUTO_PIN_LAST; i++) {
+                        hda_nid_t nid = spec->autocfg.input_pins[i];
+                        if (!nid)
+                                continue;
+                        for (j = 0; j < nconns; j++) {
+                                if (conn[j] == nid)
+                                        break;
+                        }
+                        if (j >= nconns)
+                                break;
+                }
+                if (i >= AUTO_PIN_LAST) {
+                        int num_adcs = spec->num_adc_nids;
+                        spec->private_adc_nids[num_adcs] = adc;
+                        spec->private_capsrc_nids[num_adcs] = cap;
+                        spec->num_adc_nids++;
+                        spec->adc_nids = spec->private_adc_nids;
+                        if (adc != cap)
+                                spec->capsrc_nids = spec->private_capsrc_nids;
+                }
+        }
+        if (!spec->num_adc_nids) {
+                printk(KERN_WARNING "hda_codec: %s: no valid ADC found;"
+                       " using fallback 0x%x\n",
+                       codec->chip_name, fallback_adc);
+                spec->private_adc_nids[0] = fallback_adc;
+                spec->adc_nids = spec->private_adc_nids;
+                if (fallback_adc != fallback_cap) {
+                        spec->private_capsrc_nids[0] = fallback_cap;
+                        spec->capsrc_nids = spec->private_adc_nids;
+                }
+        }
+}
+
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
 #define set_beep_amp(spec, nid, idx, dir) \
         ((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 3, idx, dir))
+#else
+#define set_beep_amp(spec, nid, idx, dir) /* NOP */
+#endif
 
 /*
  * OK, here we have finally the patch for ALC880
@@ -4856,7 +5172,6 @@ static int patch_alc880(struct hda_codec *codec)
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc880_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
 }
@@ -5064,6 +5379,7 @@ static struct snd_kcontrol_new alc260_hp_output_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x11,
                 .info = snd_ctl_boolean_mono_info,
                 .get = alc260_hp_master_sw_get,
                 .put = alc260_hp_master_sw_put,
@@ -5087,11 +5403,8 @@ static struct hda_verb alc260_hp_unsol_verbs[] = {
 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;
+        spec->jack_present = snd_hda_jack_detect(codec, 0x10);
         alc260_hp_master_update(codec, 0x0f, 0x10, 0x11);
 }
 
@@ -5105,6 +5418,7 @@ static struct snd_kcontrol_new alc260_hp_3013_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x11,
                 .info = snd_ctl_boolean_mono_info,
                 .get = alc260_hp_master_sw_get,
                 .put = alc260_hp_master_sw_put,
@@ -5156,11 +5470,8 @@ static struct hda_verb alc260_hp_3013_unsol_verbs[] = {
 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;
+        spec->jack_present = snd_hda_jack_detect(codec, 0x15);
         alc260_hp_master_update(codec, 0x15, 0x10, 0x11);
 }
 
@@ -5173,12 +5484,8 @@ static void alc260_hp_3013_unsol_event(struct hda_codec *codec,
 
 static void alc260_hp_3012_automute(struct hda_codec *codec)
 {
-        unsigned int present, bits;
+        unsigned int bits = snd_hda_jack_detect(codec, 0x10) ? 0 : PIN_OUT;
 
-        present = snd_hda_codec_read(codec, 0x10, 0,
-                        AC_VERB_GET_PIN_SENSE, 0) & AC_PINSENSE_PRESENCE;
-
-        bits = present ? 0 : PIN_OUT;
         snd_hda_codec_write(codec, 0x0f, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
                             bits);
         snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
@@ -5748,8 +6055,7 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x0f);
         if (present) {
                 snd_hda_codec_write_cache(codec, 0x01, 0,
                                           AC_VERB_SET_GPIO_DATA, 1);
@@ -5989,7 +6295,6 @@ static int alc260_add_playback_controls(struct alc_spec *spec, hda_nid_t nid,
 {
         hda_nid_t nid_vol;
         unsigned long vol_val, sw_val;
-        char name[32];
         int err;
 
         if (nid >= 0x0f && nid < 0x11) {
@@ -6009,14 +6314,12 @@ static int alc260_add_playback_controls(struct alc_spec *spec, hda_nid_t nid,
 
         if (!(*vol_bits & (1 << nid_vol))) {
                 /* first control for the volume widget */
-                snprintf(name, sizeof(name), "%s Playback Volume", pfx);
-                err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val);
+                err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx, vol_val);
                 if (err < 0)
                         return err;
                 *vol_bits |= (1 << nid_vol);
         }
-        snprintf(name, sizeof(name), "%s Playback Switch", pfx);
-        err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, sw_val);
+        err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx, sw_val);
         if (err < 0)
                 return err;
         return 1;
@@ -6124,6 +6427,8 @@ static void alc260_auto_init_analog_input(struct hda_codec *codec)
         }
 }
 
+#define alc260_auto_init_input_src      alc880_auto_init_input_src
+
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
@@ -6199,7 +6504,7 @@ static int alc260_parse_auto_config(struct hda_codec *codec)
         spec->num_mux_defs = 1;
         spec->input_mux = &spec->private_imux[0];
 
-        alc_ssid_check(codec, 0x10, 0x15, 0x0f);
+        alc_ssid_check(codec, 0x10, 0x15, 0x0f, 0);
 
         return 1;
 }
@@ -6210,6 +6515,7 @@ 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);
+        alc260_auto_init_input_src(codec);
         if (spec->unsol_event)
                 alc_inithook(codec);
 }
@@ -6246,6 +6552,7 @@ static const char *alc260_models[ALC260_MODEL_LAST] = {
 
 static struct snd_pci_quirk alc260_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_ACER),
+        SND_PCI_QUIRK(0x1025, 0x007f, "Acer", ALC260_WILL),
         SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_ACER),
         SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),
         SND_PCI_QUIRK(0x103c, 0x2808, "HP d5700", ALC260_HP_3013),
@@ -6275,7 +6582,7 @@ static struct alc_config_preset alc260_presets[] = {
                 .num_dacs = ARRAY_SIZE(alc260_dac_nids),
                 .dac_nids = alc260_dac_nids,
                 .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),
-                .adc_nids = alc260_adc_nids,
+                .adc_nids = alc260_dual_adc_nids,
                 .num_channel_mode = ARRAY_SIZE(alc260_modes),
                 .channel_mode = alc260_modes,
                 .input_mux = &alc260_capture_source,
@@ -6477,7 +6784,6 @@ static int patch_alc260(struct hda_codec *codec)
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc260_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
 }
@@ -6559,6 +6865,14 @@ static struct hda_input_mux mb5_capture_source = {
         },
 };
 
+static struct hda_input_mux macmini3_capture_source = {
+        .num_items = 2,
+        .items = {
+                { "Line", 0x2 },
+                { "CD", 0x4 },
+        },
+};
+
 static struct hda_input_mux alc883_3stack_6ch_intel = {
         .num_items = 4,
         .items = {
@@ -6619,7 +6933,7 @@ static struct hda_input_mux alc889A_mb31_capture_source = {
                 /* Front Mic (0x01) unused */
                 { "Line", 0x2 },
                 /* Line 2 (0x03) unused */
-                /* CD (0x04) unsused? */
+                /* CD (0x04) unused? */
         },
 };
 
@@ -6747,6 +7061,13 @@ static struct hda_channel_mode alc882_sixstack_modes[2] = {
         { 8, alc882_sixstack_ch8_init },
 };
 
+
+/* Macbook Air 2,1 */
+
+static struct hda_channel_mode alc885_mba21_ch_modes[1] = {
+      { 2, NULL },
+};
+
 /*
  * macbook pro ALC885 can switch LineIn to LineOut without losing Mic
  */
@@ -6807,6 +7128,7 @@ static struct hda_channel_mode alc885_mb5_6ch_modes[2] = {
         { 6, alc885_mb5_ch6_init },
 };
 
+#define alc885_macmini3_6ch_modes       alc885_mb5_6ch_modes
 
 /*
  * 2ch mode
@@ -7018,6 +7340,15 @@ static struct snd_kcontrol_new alc882_base_mixer[] = {
         { } /* end */
 };
 
+/* Macbook Air 2,1 same control for HP and internal Speaker */
+
+static struct snd_kcontrol_new alc885_mba21_mixer[] = {
+      HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
+      HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 0x02, HDA_OUTPUT),
+     { }
+};
+
+
 static struct snd_kcontrol_new alc885_mbp3_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
         HDA_BIND_MUTE   ("Speaker Playback Switch", 0x0c, 0x02, HDA_INPUT),
@@ -7040,8 +7371,8 @@ static struct snd_kcontrol_new alc885_mb5_mixer[] = {
         HDA_BIND_MUTE   ("Surround Playback Switch", 0x0d, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("LFE Playback Volume", 0x0e, 0x00, HDA_OUTPUT),
         HDA_BIND_MUTE   ("LFE Playback Switch", 0x0e, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("HP Playback Volume", 0x0f, 0x00, HDA_OUTPUT),
-        HDA_BIND_MUTE   ("HP Playback Switch", 0x0f, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0f, 0x00, HDA_OUTPUT),
+        HDA_BIND_MUTE   ("Headphone Playback Switch", 0x0f, 0x02, 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, 0x01, HDA_INPUT),
@@ -7051,6 +7382,35 @@ static struct snd_kcontrol_new alc885_mb5_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new alc885_macmini3_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
+        HDA_BIND_MUTE   ("Front Playback Switch", 0x0c, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT),
+        HDA_BIND_MUTE   ("Surround Playback Switch", 0x0d, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("LFE Playback Volume", 0x0e, 0x00, HDA_OUTPUT),
+        HDA_BIND_MUTE   ("LFE Playback Switch", 0x0e, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0f, 0x00, HDA_OUTPUT),
+        HDA_BIND_MUTE   ("Headphone Playback Switch", 0x0f, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x07, HDA_INPUT),
+        HDA_CODEC_MUTE  ("Line Playback Switch", 0x0b, 0x07, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Boost", 0x15, 0x00, HDA_INPUT),
+        { } /* end */
+};
+
+static struct snd_kcontrol_new alc885_imac91_mixer[] = {
+        HDA_CODEC_VOLUME("Line-Out Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
+        HDA_BIND_MUTE   ("Line-Out Playback Switch", 0x0c, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE  ("Speaker Playback Switch", 0x14, 0x00, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Speaker 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("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),
@@ -7128,29 +7488,18 @@ static struct snd_kcontrol_new alc882_chmode_mixer[] = {
 
 static struct hda_verb alc882_base_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)},
         /* CLFE mixer */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
         /* Side mixer */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
 
-        /* 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},
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -7187,14 +7536,8 @@ static struct hda_verb alc882_base_init_verbs[] = {
         /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
         /* 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)},
         /* ADC2: mute amp left and right */
         {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
@@ -7238,26 +7581,17 @@ static struct hda_verb alc_hp15_unsol_verbs[] = {
 
 static struct hda_verb alc885_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)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(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)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         /* CLFE mixer */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         /* Side mixer */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-
-        /* 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(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
 
         /* Front HP Pin: output 0 (0x0c) */
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -7291,17 +7625,11 @@ static struct hda_verb alc885_init_verbs[] = {
 
         /* Mixer elements: 0x18, , 0x1a, 0x1b */
         /* Input mixer1 */
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* Input mixer2 */
         {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
         /* Input mixer3 */
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* ADC2: mute amp left and right */
         {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         /* ADC3: mute amp left and right */
@@ -7336,8 +7664,8 @@ static struct snd_kcontrol_new alc882_macpro_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),
         /* FIXME: this looks suspicious...
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Beep Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Beep Playback Switch", 0x0b, 0x02, HDA_INPUT),
         */
         { } /* end */
 };
@@ -7428,6 +7756,7 @@ static struct hda_verb alc885_mb5_init_verbs[] = {
         {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, 0x03},
+        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
         /* 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},
@@ -7442,6 +7771,76 @@ static struct hda_verb alc885_mb5_init_verbs[] = {
         { }
 };
 
+/* Macmini 3,1 */
+static struct hda_verb alc885_macmini3_init_verbs[] = {
+        /* DACs */
+        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Front mixer */
+        {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)},
+        /* Surround 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)},
+        /* LFE mixer */
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* HP mixer */
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* Front Pin (0x0c) */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x01},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x18, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* LFE Pin (0x0e) */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x01},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1a, AC_VERB_SET_CONNECT_SEL, 0x02},
+        /* HP Pin (0x0f) */
+        {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, 0x03},
+        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
+        /* Line In pin */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {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)},
+        { }
+};
+
+
+static struct hda_verb alc885_mba21_init_verbs[] = {
+        /*Internal and HP Speaker Mixer*/
+        {0x0c, 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)},
+        /*Internal Speaker Pin (0x0c)*/
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, (PIN_OUT | AC_PINCTL_VREF_50) },
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x18, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* HP Pin: output 0 (0x0e) */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc4},
+        {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)},
+        /* Line in (is hp when jack connected)*/
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_VREF_50},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+
+        { }
+ };
+
+
 /* Macbook Pro rev3 */
 static struct hda_verb alc885_mbp3_init_verbs[] = {
         /* Front mixer: unmute input/output amp left and right (volume = 0) */
@@ -7506,6 +7905,66 @@ static struct hda_verb alc885_mbp3_init_verbs[] = {
         { }
 };
 
+/* iMac 9,1 */
+static struct hda_verb alc885_imac91_init_verbs[] = {
+        /* Line-Out 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)},
+        /* 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},
+        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
+        /* Internal Speakers: output 0 (0x0d) */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* 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),
@@ -7544,6 +8003,20 @@ static void alc885_imac24_setup(struct hda_codec *codec)
         spec->autocfg.speaker_pins[1] = 0x1a;
 }
 
+#define alc885_mb5_setup        alc885_imac24_setup
+#define alc885_macmini3_setup   alc885_imac24_setup
+
+/* Macbook Air 2,1 */
+static void alc885_mba21_setup(struct hda_codec *codec)
+{
+       struct alc_spec *spec = codec->spec;
+
+       spec->autocfg.hp_pins[0] = 0x14;
+       spec->autocfg.speaker_pins[0] = 0x18;
+}
+
+
+
 static void alc885_mbp3_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -7552,6 +8025,14 @@ static void alc885_mbp3_setup(struct hda_codec *codec)
         spec->autocfg.speaker_pins[0] = 0x14;
 }
 
+static void alc885_imac91_setup(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+
+        spec->autocfg.hp_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[1] = 0x1a;
+}
 
 static struct hda_verb alc882_targa_verbs[] = {
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -7685,18 +8166,6 @@ 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)},
 
-        /* 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_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)
          */
@@ -7721,16 +8190,9 @@ static struct hda_verb alc883_auto_init_verbs[] = {
         /* FIXME: use matrix-type input source selection */
         /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
         /* Input mixer2 */
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* Input mixer3 */
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { }
 };
 
@@ -8026,6 +8488,42 @@ static struct snd_kcontrol_new alc883_medion_md2_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new alc883_medion_wim2160_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_MUTE("Speaker Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x08, 0x0, HDA_INPUT),
+        { } /* end */
+};
+
+static struct hda_verb alc883_medion_wim2160_verbs[] = {
+        /* Unmute front mixer */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        /* Set speaker pin to front mixer */
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* Init headphone pin */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x1a, 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_wim2160_setup(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+
+        spec->autocfg.hp_pins[0] = 0x1a;
+        spec->autocfg.speaker_pins[0] = 0x15;
+}
+
 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),
@@ -8040,9 +8538,7 @@ static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = {
 
 static struct snd_kcontrol_new alc888_acer_aspire_6530_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("LFE Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("LFE Playback Switch", 0x0f, 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("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
@@ -8184,12 +8680,8 @@ static void alc883_mitac_setup(struct hda_codec *codec)
 /*
 static void alc883_mitac_mic_automute(struct hda_codec *codec)
 {
-        unsigned int present;
-        unsigned char bits;
+        unsigned char bits = snd_hda_jack_detect(codec, 0x18) ? HDA_AMP_MUTE : 0;
 
-        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);
 }
 */
@@ -8411,10 +8903,8 @@ static struct hda_channel_mode alc888_3st_hp_modes[3] = {
 /* 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;
+        unsigned int present = snd_hda_jack_detect(codec, 0x1b);
 
-        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,
@@ -8424,10 +8914,8 @@ static void alc888_lenovo_ms7195_front_automute(struct hda_codec *codec)
 /* toggle RCA according to the front-jack state */
 static void alc888_lenovo_ms7195_rca_automute(struct hda_codec *codec)
 {
-        unsigned int present;
+        unsigned int present = snd_hda_jack_detect(codec, 0x14);
 
-        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);
 }
@@ -8468,8 +8956,7 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x18);
         snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1,
                                  HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
 }
@@ -8520,24 +9007,16 @@ static void alc883_haier_w66_setup(struct hda_codec *codec)
 
 static void alc883_lenovo_101e_ispeaker_automute(struct hda_codec *codec)
 {
-        unsigned int present;
-        unsigned char bits;
+        int bits = snd_hda_jack_detect(codec, 0x14) ? HDA_AMP_MUTE : 0;
 
-        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_lenovo_101e_all_automute(struct hda_codec *codec)
 {
-        unsigned int present;
-        unsigned char bits;
+        int bits = snd_hda_jack_detect(codec, 0x1b) ? HDA_AMP_MUTE : 0;
 
-        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,
@@ -8688,8 +9167,7 @@ static void alc889A_mb31_automute(struct hda_codec *codec)
         /* Mute only in 2ch or 4ch mode */
         if (snd_hda_codec_read(codec, 0x15, 0, AC_VERB_GET_CONNECT_SEL, 0)
             == 0x00) {
-                present = snd_hda_codec_read(codec, 0x15, 0,
-                        AC_VERB_GET_PIN_SENSE, 0) & AC_PINSENSE_PRESENCE;
+                present = snd_hda_jack_detect(codec, 0x15);
                 snd_hda_codec_amp_stereo(codec, 0x14,  HDA_OUTPUT, 0,
                         HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
                 snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
@@ -8735,8 +9213,11 @@ static const char *alc882_models[ALC882_MODEL_LAST] = {
         [ALC882_ASUS_A7M]       = "asus-a7m",
         [ALC885_MACPRO]         = "macpro",
         [ALC885_MB5]            = "mb5",
+        [ALC885_MACMINI3]       = "macmini3",
+        [ALC885_MBA21]          = "mba21",
         [ALC885_MBP3]           = "mbp3",
         [ALC885_IMAC24]         = "imac24",
+        [ALC885_IMAC91]         = "imac91",
         [ALC883_3ST_2ch_DIG]    = "3stack-2ch-dig",
         [ALC883_3ST_6ch_DIG]    = "3stack-6ch-dig",
         [ALC883_3ST_6ch]        = "3stack-6ch",
@@ -8752,6 +9233,7 @@ static const char *alc882_models[ALC882_MODEL_LAST] = {
         [ALC888_ACER_ASPIRE_7730G]      = "acer-aspire-7730g",
         [ALC883_MEDION]         = "medion",
         [ALC883_MEDION_MD2]     = "medion-md2",
+        [ALC883_MEDION_WIM2160] = "medion-wim2160",
         [ALC883_LAPTOP_EAPD]    = "laptop-eapd",
         [ALC883_LENOVO_101E_2ch] = "lenovo-101e",
         [ALC883_LENOVO_NB0763]  = "lenovo-nb0763",
@@ -8839,7 +9321,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1462, 0x040d, "MSI", ALC883_TARGA_2ch_DIG),
         SND_PCI_QUIRK(0x1462, 0x0579, "MSI", ALC883_TARGA_2ch_DIG),
         SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8  */
-        SND_PCI_QUIRK(0x1462, 0x2fb3, "MSI", ALC883_TARGA_2ch_DIG),
+        SND_PCI_QUIRK(0x1462, 0x2fb3, "MSI", ALC882_AUTO),
         SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG),
         SND_PCI_QUIRK(0x1462, 0x3729, "MSI S420", ALC883_TARGA_DIG),
         SND_PCI_QUIRK(0x1462, 0x3783, "NEC S970", ALC883_TARGA_DIG),
@@ -8853,6 +9335,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
         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, 0x4570, "MSI Wind Top AE2220", ALC883_TARGA_DIG),
         SND_PCI_QUIRK(0x1462, 0x6510, "MSI GX620", ALC883_TARGA_8ch_DIG),
         SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG),
         SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG),
@@ -8862,10 +9345,12 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG),
         SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG),
         SND_PCI_QUIRK(0x1462, 0x7350, "MSI", ALC883_6ST_DIG),
+        SND_PCI_QUIRK(0x1462, 0x7437, "MSI NetOn AP1900", ALC883_TARGA_DIG),
         SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG),
         SND_PCI_QUIRK(0x1462, 0xaa08, "MSI", ALC883_TARGA_2ch_DIG),
 
         SND_PCI_QUIRK(0x147b, 0x1083, "Abit IP35-PRO", ALC883_6ST_DIG),
+        SND_PCI_QUIRK(0x1558, 0x0571, "Clevo laptop M570U", ALC883_3ST_6ch_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, 0x5409, "Clevo laptop M540R", ALC883_CLEVO_M540R),
@@ -8893,7 +9378,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
         SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC889_INTEL),
         SND_PCI_QUIRK(0x8086, 0x0021, "Intel IbexPeak", ALC889A_INTEL),
         SND_PCI_QUIRK(0x8086, 0x3b56, "Intel IbexPeak", ALC889A_INTEL),
-        SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch),
+        SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC882_6ST_DIG),
 
         {}
 };
@@ -8910,12 +9395,14 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = {
         SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889A_MB31),
         SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3),
         SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24),
+        SND_PCI_QUIRK(0x106b, 0x4900, "iMac 9,1 Aluminum", ALC885_IMAC91),
         SND_PCI_QUIRK(0x106b, 0x3f00, "Macbook 5,1", ALC885_MB5),
         /* FIXME: HP jack sense seems not working for MBP 5,1 or 5,2,
          * so apparently no perfect solution yet
          */
         SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC885_MB5),
         SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5),
+        SND_PCI_QUIRK(0x106b, 0x4100, "Macmini 3,1", ALC885_MACMINI3),
         {} /* terminator */
 };
 
@@ -8967,6 +9454,18 @@ static struct alc_config_preset alc882_presets[] = {
                 .input_mux = &alc882_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
         },
+           [ALC885_MBA21] = {
+                        .mixers = { alc885_mba21_mixer },
+                        .init_verbs = { alc885_mba21_init_verbs, alc880_gpio1_init_verbs },
+                        .num_dacs = 2,
+                        .dac_nids = alc882_dac_nids,
+                        .channel_mode = alc885_mba21_ch_modes,
+                        .num_channel_mode = ARRAY_SIZE(alc885_mba21_ch_modes),
+                        .input_mux = &alc882_capture_source,
+                        .unsol_event = alc_automute_amp_unsol_event,
+                        .setup = alc885_mba21_setup,
+                        .init_hook = alc_automute_amp,
+       },
         [ALC885_MBP3] = {
                 .mixers = { alc885_mbp3_mixer, alc882_chmode_mixer },
                 .init_verbs = { alc885_mbp3_init_verbs,
@@ -8994,6 +9493,24 @@ static struct alc_config_preset alc882_presets[] = {
                 .input_mux = &mb5_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
+                .unsol_event = alc_automute_amp_unsol_event,
+                .setup = alc885_mb5_setup,
+                .init_hook = alc_automute_amp,
+        },
+        [ALC885_MACMINI3] = {
+                .mixers = { alc885_macmini3_mixer, alc882_chmode_mixer },
+                .init_verbs = { alc885_macmini3_init_verbs,
+                                alc880_gpio1_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc882_dac_nids),
+                .dac_nids = alc882_dac_nids,
+                .channel_mode = alc885_macmini3_6ch_modes,
+                .num_channel_mode = ARRAY_SIZE(alc885_macmini3_6ch_modes),
+                .input_mux = &macmini3_capture_source,
+                .dig_out_nid = ALC882_DIGOUT_NID,
+                .dig_in_nid = ALC882_DIGIN_NID,
+                .unsol_event = alc_automute_amp_unsol_event,
+                .setup = alc885_macmini3_setup,
+                .init_hook = alc_automute_amp,
         },
         [ALC885_MACPRO] = {
                 .mixers = { alc882_macpro_mixer },
@@ -9021,6 +9538,21 @@ static struct alc_config_preset alc882_presets[] = {
                 .setup = alc885_imac24_setup,
                 .init_hook = alc885_imac24_init_hook,
         },
+        [ALC885_IMAC91] = {
+                .mixers = { alc885_imac91_mixer, alc882_chmode_mixer },
+                .init_verbs = { alc885_imac91_init_verbs,
+                                alc880_gpio1_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc882_dac_nids),
+                .dac_nids = alc882_dac_nids,
+                .channel_mode = alc885_mbp_4ch_modes,
+                .num_channel_mode = ARRAY_SIZE(alc885_mbp_4ch_modes),
+                .input_mux = &alc882_capture_source,
+                .dig_out_nid = ALC882_DIGOUT_NID,
+                .dig_in_nid = ALC882_DIGIN_NID,
+                .unsol_event = alc_automute_amp_unsol_event,
+                .setup = alc885_imac91_setup,
+                .init_hook = alc_automute_amp,
+        },
         [ALC882_TARGA] = {
                 .mixers = { alc882_targa_mixer, alc882_chmode_mixer },
                 .init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs,
@@ -9187,6 +9719,7 @@ static struct alc_config_preset alc882_presets[] = {
                 .dac_nids = alc883_dac_nids,
                 .adc_nids = alc883_adc_nids_alt,
                 .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),
+                .capsrc_nids = alc883_capsrc_nids,
                 .dig_out_nid = ALC883_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
                 .channel_mode = alc883_3ST_2ch_modes,
@@ -9256,6 +9789,7 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
                 .channel_mode = alc883_3ST_6ch_modes,
                 .need_dac_fix = 1,
+                .const_channel_count = 6,
                 .num_mux_defs =
                         ARRAY_SIZE(alc888_2_capture_sources),
                 .input_mux = alc888_2_capture_sources,
@@ -9283,10 +9817,11 @@ static struct alc_config_preset alc882_presets[] = {
                 .init_hook = alc_automute_amp,
         },
         [ALC888_ACER_ASPIRE_8930G] = {
-                .mixers = { alc888_base_mixer,
+                .mixers = { alc889_acer_aspire_8930g_mixer,
                                 alc883_chmode_mixer },
                 .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,
-                                alc889_acer_aspire_8930g_verbs },
+                                alc889_acer_aspire_8930g_verbs,
+                                alc889_eapd_verbs},
                 .num_dacs = ARRAY_SIZE(alc883_dac_nids),
                 .dac_nids = alc883_dac_nids,
                 .num_adc_nids = ARRAY_SIZE(alc889_adc_nids),
@@ -9303,6 +9838,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .unsol_event = alc_automute_amp_unsol_event,
                 .setup = alc889_acer_aspire_8930g_setup,
                 .init_hook = alc_automute_amp,
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+                .power_hook = alc_power_eapd,
+#endif
         },
         [ALC888_ACER_ASPIRE_7730G] = {
                 .mixers = { alc883_3ST_6ch_mixer,
@@ -9333,6 +9871,7 @@ static struct alc_config_preset alc882_presets[] = {
                 .dac_nids = alc883_dac_nids,
                 .adc_nids = alc883_adc_nids_alt,
                 .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),
+                .capsrc_nids = alc883_capsrc_nids,
                 .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
                 .channel_mode = alc883_sixstack_modes,
                 .input_mux = &alc883_capture_source,
@@ -9350,6 +9889,21 @@ static struct alc_config_preset alc882_presets[] = {
                 .setup = alc883_medion_md2_setup,
                 .init_hook = alc_automute_amp,
         },
+        [ALC883_MEDION_WIM2160] = {
+                .mixers = { alc883_medion_wim2160_mixer },
+                .init_verbs = { alc883_init_verbs, alc883_medion_wim2160_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,
+                .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
+                .channel_mode = alc883_3ST_2ch_modes,
+                .input_mux = &alc883_capture_source,
+                .unsol_event = alc_automute_amp_unsol_event,
+                .setup = alc883_medion_wim2160_setup,
+                .init_hook = alc_automute_amp,
+        },
         [ALC883_LAPTOP_EAPD] = {
                 .mixers = { alc883_base_mixer },
                 .init_verbs = { alc883_init_verbs, alc882_eapd_verbs },
@@ -9394,6 +9948,7 @@ static struct alc_config_preset alc882_presets[] = {
                 .dac_nids = alc883_dac_nids,
                 .adc_nids = alc883_adc_nids_alt,
                 .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),
+                .capsrc_nids = alc883_capsrc_nids,
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
                 .channel_mode = alc883_3ST_2ch_modes,
                 .input_mux = &alc883_lenovo_101e_capture_source,
@@ -9573,6 +10128,7 @@ static struct alc_config_preset alc882_presets[] = {
                         alc880_gpio1_init_verbs },
                 .adc_nids = alc883_adc_nids,
                 .num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
+                .capsrc_nids = alc883_capsrc_nids,
                 .dac_nids = alc883_dac_nids,
                 .num_dacs = ARRAY_SIZE(alc883_dac_nids),
                 .channel_mode = alc889A_mb31_6ch_modes,
@@ -9640,6 +10196,8 @@ static void alc882_auto_set_output_and_unmute(struct hda_codec *codec,
         int idx;
 
         alc_set_pin_output(codec, nid, pin_type);
+        if (dac_idx >= spec->multiout.num_dacs)
+                return;
         if (spec->multiout.dac_nids[dac_idx] == 0x25)
                 idx = 4;
         else
@@ -9711,6 +10269,8 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)
                         continue;
                 mux_idx = c >= spec->num_mux_defs ? 0 : c;
                 imux = &spec->input_mux[mux_idx];
+                if (!imux->num_items && mux_idx > 0)
+                        imux = &spec->input_mux[0];
                 for (idx = 0; idx < conns; idx++) {
                         /* if the current connection is the selected one,
                          * unmute it as default - otherwise mute it
@@ -9833,7 +10393,7 @@ static int alc882_parse_auto_config(struct hda_codec *codec)
         spec->num_mux_defs = 1;
         spec->input_mux = &spec->private_imux[0];
 
-        alc_ssid_check(codec, 0x15, 0x1b, 0x14);
+        alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);
 
         err = alc_auto_add_mic_boost(codec);
         if (err < 0)
@@ -9889,7 +10449,8 @@ static int patch_alc882(struct hda_codec *codec)
                 board_config = ALC882_AUTO;
         }
 
-        alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups);
+        if (board_config == ALC882_AUTO)
+                alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups, 1);
 
         if (board_config == ALC882_AUTO) {
                 /* automatic parse from the BIOS config */
@@ -9927,10 +10488,12 @@ static int patch_alc882(struct hda_codec *codec)
                 spec->init_amp = ALC_INIT_DEFAULT; /* always initialize */
 
         if (!spec->adc_nids && spec->input_mux) {
-                int i;
+                int i, j;
                 spec->num_adc_nids = 0;
                 for (i = 0; i < ARRAY_SIZE(alc882_adc_nids); i++) {
+                        const struct hda_input_mux *imux = spec->input_mux;
                         hda_nid_t cap;
+                        hda_nid_t items[16];
                         hda_nid_t nid = alc882_adc_nids[i];
                         unsigned int wcap = get_wcaps(codec, nid);
                         /* get type */
@@ -9941,6 +10504,15 @@ static int patch_alc882(struct hda_codec *codec)
                         err = snd_hda_get_connections(codec, nid, &cap, 1);
                         if (err < 0)
                                 continue;
+                        err = snd_hda_get_connections(codec, cap, items,
+                                                      ARRAY_SIZE(items));
+                        if (err < 0)
+                                continue;
+                        for (j = 0; j < imux->num_items; j++)
+                                if (imux->items[j].index >= err)
+                                        break;
+                        if (j < imux->num_items)
+                                continue;
                         spec->private_capsrc_nids[spec->num_adc_nids] = cap;
                         spec->num_adc_nids++;
                 }
@@ -9951,6 +10523,9 @@ static int patch_alc882(struct hda_codec *codec)
         set_capture_mixer(codec);
         set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
+        if (board_config == ALC882_AUTO)
+                alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups, 0);
+
         spec->vmaster_nid = 0x0c;
 
         codec->patch_ops = alc_patch_ops;
@@ -9960,7 +10535,6 @@ static int patch_alc882(struct hda_codec *codec)
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc882_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
 }
@@ -10032,10 +10606,8 @@ static void alc262_hp_master_update(struct hda_codec *codec)
 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);
+
+        spec->jack_present = snd_hda_jack_detect(codec, 0x1b);
         alc262_hp_master_update(codec);
 }
 
@@ -10049,10 +10621,8 @@ static void alc262_hp_bpc_unsol_event(struct hda_codec *codec, unsigned int res)
 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);
+
+        spec->jack_present = snd_hda_jack_detect(codec, 0x15);
         alc262_hp_master_update(codec);
 }
 
@@ -10087,8 +10657,14 @@ static int alc262_hp_master_sw_put(struct snd_kcontrol *kcontrol,
                 .info = snd_ctl_boolean_mono_info,              \
                 .get = alc262_hp_master_sw_get,                 \
                 .put = alc262_hp_master_sw_put,                 \
+        }, \
+        {                                                       \
+                .iface = NID_MAPPING,                           \
+                .name = "Master Playback Switch",               \
+                .private_value = 0x15 | (0x16 << 8) | (0x1b << 16),     \
         }
 
+
 static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {
         ALC262_HP_MASTER_SWITCH,
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
@@ -10146,7 +10722,7 @@ static void alc262_hp_t5735_setup(struct hda_codec *codec)
         struct alc_spec *spec = codec->spec;
 
         spec->autocfg.hp_pins[0] = 0x15;
-        spec->autocfg.speaker_pins[0] = 0x0c; /* HACK: not actually a pin */
+        spec->autocfg.speaker_pins[0] = 0x14;
 }
 
 static struct snd_kcontrol_new alc262_hp_t5735_mixer[] = {
@@ -10246,6 +10822,12 @@ static int alc262_hippo_master_sw_put(struct snd_kcontrol *kcontrol,
                 .info = snd_ctl_boolean_mono_info,              \
                 .get = alc262_hippo_master_sw_get,              \
                 .put = alc262_hippo_master_sw_put,              \
+        },                                                      \
+        {                                                       \
+                .iface = NID_MAPPING,                           \
+                .name = "Master Playback Switch",               \
+                .subdevice = SUBDEV_HP(0) | (SUBDEV_LINE(0) << 8) | \
+                             (SUBDEV_SPEAKER(0) << 16), \
         }
 
 static struct snd_kcontrol_new alc262_hippo_mixer[] = {
@@ -10286,13 +10868,8 @@ static void alc262_hippo_automute(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         hda_nid_t hp_nid = spec->autocfg.hp_pins[0];
-        unsigned int present;
 
-        /* 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;
+        spec->jack_present = snd_hda_jack_detect(codec, hp_nid);
         alc262_hippo_master_update(codec);
 }
 
@@ -10581,6 +11158,13 @@ static struct hda_verb alc262_lenovo_3000_unsol_verbs[] = {
         {}
 };
 
+static struct hda_verb alc262_lenovo_3000_init_verbs[] = {
+        /* Front Mic pin: input vref at 50% */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {}
+};
+
 static struct hda_input_mux alc262_fujitsu_capture_source = {
         .num_items = 3,
         .items = {
@@ -10618,21 +11202,8 @@ static void alc262_fujitsu_automute(struct hda_codec *codec, int force)
         unsigned int mute;
 
         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);
-                /* 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->jack_present = snd_hda_jack_detect(codec, 0x14) ||
+                                     snd_hda_jack_detect(codec, 0x1b);
                 spec->sense_updated = 1;
         }
         /* unmute internal speaker only if both HPs are unplugged and
@@ -10677,12 +11248,7 @@ static void alc262_lenovo_3000_automute(struct hda_codec *codec, int force)
         unsigned int mute;
 
         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->jack_present = snd_hda_jack_detect(codec, 0x1b);
                 spec->sense_updated = 1;
         }
         if (spec->jack_present) {
@@ -10742,11 +11308,17 @@ static struct snd_kcontrol_new alc262_fujitsu_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .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),
         },
+        {
+                .iface = NID_MAPPING,
+                .name = "Master Playback Switch",
+                .private_value = 0x1b,
+        },
         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),
@@ -10777,6 +11349,7 @@ static struct snd_kcontrol_new alc262_lenovo_3000_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = alc262_lenovo_3000_master_sw_put,
@@ -10874,12 +11447,7 @@ static void alc262_ultra_automute(struct hda_codec *codec)
         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;
+                spec->jack_present = snd_hda_jack_detect(codec, 0x15);
                 if (spec->jack_present)
                         mute = HDA_AMP_MUTE;
         }
@@ -10936,6 +11504,11 @@ static struct snd_kcontrol_new alc262_ultra_capture_mixer[] = {
                 .get = alc_mux_enum_get,
                 .put = alc262_ultra_mux_enum_put,
         },
+        {
+                .iface = NID_MAPPING,
+                .name = "Capture Source",
+                .private_value = 0x15,
+        },
         { } /* end */
 };
 
@@ -10956,7 +11529,6 @@ static int alc262_check_volbit(hda_nid_t nid)
 static int alc262_add_out_vol_ctl(struct alc_spec *spec, hda_nid_t nid,
                                   const char *pfx, int *vbits)
 {
-        char name[32];
         unsigned long val;
         int vbit;
 
@@ -10966,28 +11538,25 @@ static int alc262_add_out_vol_ctl(struct alc_spec *spec, hda_nid_t nid,
         if (*vbits & vbit) /* a volume control for this mixer already there */
                 return 0;
         *vbits |= vbit;
-        snprintf(name, sizeof(name), "%s Playback Volume", pfx);
         if (vbit == 2)
                 val = HDA_COMPOSE_AMP_VAL(0x0e, 2, 0, HDA_OUTPUT);
         else
                 val = HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT);
-        return add_control(spec, ALC_CTL_WIDGET_VOL, name, val);
+        return add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx, val);
 }
 
 static int alc262_add_out_sw_ctl(struct alc_spec *spec, hda_nid_t nid,
                                  const char *pfx)
 {
-        char name[32];
         unsigned long val;
 
         if (!nid)
                 return 0;
-        snprintf(name, sizeof(name), "%s Playback Switch", pfx);
         if (nid == 0x16)
                 val = HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT);
         else
                 val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
-        return add_control(spec, ALC_CTL_WIDGET_MUTE, name, val);
+        return add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx, val);
 }
 
 /* add playback controls from the parsed DAC table */
@@ -11043,7 +11612,7 @@ static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec,
 }
 
 #define alc262_auto_create_input_ctls \
-        alc880_auto_create_input_ctls
+        alc882_auto_create_input_ctls
 
 /*
  * generic initialization of ADC, input mixers and output mixers
@@ -11386,7 +11955,7 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
-        alc_ssid_check(codec, 0x15, 0x14, 0x1b);
+        alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);
 
         return 1;
 }
@@ -11463,8 +12032,10 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = {
         SND_PCI_QUIRK(0x104d, 0x9025, "Sony VAIO Z21MN", ALC262_TOSHIBA_S06),
         SND_PCI_QUIRK(0x104d, 0x9035, "Sony VAIO VGN-FW170J", ALC262_AUTO),
         SND_PCI_QUIRK(0x104d, 0x9047, "Sony VAIO Type G", ALC262_AUTO),
+#if 0 /* disable the quirk since model=auto works better in recent versions */
         SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO",
                            ALC262_SONY_ASSAMD),
+#endif
         SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
                       ALC262_TOSHIBA_RX1),
         SND_PCI_QUIRK(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06),
@@ -11580,9 +12151,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc262_hp_t5735_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_inithook,
         },
         [ALC262_HP_RP5700] = {
                 .mixers = { alc262_hp_rp5700_mixer },
@@ -11648,7 +12219,8 @@ static struct alc_config_preset alc262_presets[] = {
         [ALC262_LENOVO_3000] = {
                 .mixers = { alc262_lenovo_3000_mixer },
                 .init_verbs = { alc262_init_verbs, alc262_EAPD_verbs,
-                                alc262_lenovo_3000_unsol_verbs },
+                                alc262_lenovo_3000_unsol_verbs,
+                                alc262_lenovo_3000_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc262_dac_nids),
                 .dac_nids = alc262_dac_nids,
                 .hp_nid = 0x03,
@@ -11826,7 +12398,6 @@ static int patch_alc262(struct hda_codec *codec)
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc262_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
 }
@@ -11923,10 +12494,7 @@ static void alc268_acer_automute(struct hda_codec *codec, int force)
         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->jack_present = snd_hda_jack_detect(codec, 0x14);
                 spec->sense_updated = 1;
         }
         if (spec->jack_present)
@@ -11958,6 +12526,7 @@ static struct snd_kcontrol_new alc268_acer_aspire_one_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = alc268_acer_master_sw_put,
@@ -11973,6 +12542,7 @@ static struct snd_kcontrol_new alc268_acer_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = alc268_acer_master_sw_put,
@@ -11990,6 +12560,7 @@ static struct snd_kcontrol_new alc268_acer_dmic_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = alc268_acer_master_sw_put,
@@ -12045,13 +12616,12 @@ static void alc268_aspire_one_speaker_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) & 0x80000000;
-        bits = present ? AMP_IN_MUTE(0) : 0;
+        present = snd_hda_jack_detect(codec, 0x15);
+        bits = present ? HDA_AMP_MUTE : 0;
         snd_hda_codec_amp_stereo(codec, 0x0f, HDA_INPUT, 0,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0f, HDA_INPUT, 1,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
 }
 
 static void alc268_acer_lc_unsol_event(struct hda_codec *codec,
@@ -12327,17 +12897,16 @@ static struct snd_kcontrol_new alc268_test_mixer[] = {
 static int alc268_new_analog_output(struct alc_spec *spec, hda_nid_t nid,
                                     const char *ctlname, int idx)
 {
-        char name[32];
         hda_nid_t dac;
         int err;
 
-        sprintf(name, "%s Playback Volume", ctlname);
         switch (nid) {
         case 0x14:
         case 0x16:
                 dac = 0x02;
                 break;
         case 0x15:
+        case 0x21: /* ALC269vb has this pin, too */
                 dac = 0x03;
                 break;
         default:
@@ -12345,7 +12914,7 @@ static int alc268_new_analog_output(struct alc_spec *spec, hda_nid_t nid,
         }
         if (spec->multiout.dac_nids[0] != dac &&
             spec->multiout.dac_nids[1] != dac) {
-                err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, ctlname,
                                   HDA_COMPOSE_AMP_VAL(dac, 3, idx,
                                                       HDA_OUTPUT));
                 if (err < 0)
@@ -12353,12 +12922,11 @@ static int alc268_new_analog_output(struct alc_spec *spec, hda_nid_t nid,
                 spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac;
         }
 
-        sprintf(name, "%s Playback Switch", ctlname);
         if (nid != 0x16)
-                err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+                err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname,
                           HDA_COMPOSE_AMP_VAL(nid, 3, idx, HDA_OUTPUT));
         else /* mono */
-                err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+                err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname,
                           HDA_COMPOSE_AMP_VAL(nid, 2, idx, HDA_OUTPUT));
         if (err < 0)
                 return err;
@@ -12388,8 +12956,7 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,
 
         nid = cfg->speaker_pins[0];
         if (nid == 0x1d) {
-                err = add_control(spec, ALC_CTL_WIDGET_VOL,
-                                  "Speaker Playback Volume",
+                err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, "Speaker",
                                   HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
                 if (err < 0)
                         return err;
@@ -12407,8 +12974,7 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,
 
         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",
+                err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, "Mono",
                                   HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT));
                 if (err < 0)
                         return err;
@@ -12561,7 +13127,7 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
-        alc_ssid_check(codec, 0x15, 0x1b, 0x14);
+        alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);
 
         return 1;
 }
@@ -12794,7 +13360,7 @@ static int patch_alc268(struct hda_codec *codec)
         int board_config;
         int i, has_beep, err;
 
-        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
 
@@ -12806,7 +13372,7 @@ static int patch_alc268(struct hda_codec *codec)
 
         if (board_config < 0 || board_config >= ALC268_MODEL_LAST)
                 board_config = snd_hda_check_board_codec_sid_config(codec,
-                        ALC882_MODEL_LAST, alc268_models, alc268_ssid_cfg_tbl);
+                        ALC268_MODEL_LAST, alc268_models, alc268_ssid_cfg_tbl);
 
         if (board_config < 0 || board_config >= ALC268_MODEL_LAST) {
                 printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
@@ -12898,8 +13464,6 @@ static int patch_alc268(struct hda_codec *codec)
         if (board_config == ALC268_AUTO)
                 spec->init_hook = alc268_auto_init;
 
-        codec->proc_widget_hook = print_realtek_coef;
-
         return 0;
 }
 
@@ -12919,9 +13483,18 @@ static hda_nid_t alc269_capsrc_nids[1] = {
         0x23,
 };
 
-/* NOTE: ADC2 (0x07) is connected from a recording *MIXER* (0x24),
- *       not a mux!
- */
+static hda_nid_t alc269vb_adc_nids[1] = {
+        /* ADC1 */
+        0x09,
+};
+
+static hda_nid_t alc269vb_capsrc_nids[1] = {
+        0x22,
+};
+
+static hda_nid_t alc269_adc_candidates[] = {
+        0x08, 0x09, 0x07,
+};
 
 #define alc269_modes            alc260_modes
 #define alc269_capture_source   alc880_lg_lw_capture_source
@@ -12948,6 +13521,7 @@ static struct snd_kcontrol_new alc269_quanta_fl1_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = alc268_acer_master_sw_put,
@@ -12968,6 +13542,7 @@ static struct snd_kcontrol_new alc269_lifebook_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = alc268_acer_master_sw_put,
@@ -12985,7 +13560,7 @@ static struct snd_kcontrol_new alc269_lifebook_mixer[] = {
         { }
 };
 
-static struct snd_kcontrol_new alc269_eeepc_mixer[] = {
+static struct snd_kcontrol_new alc269_laptop_mixer[] = {
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
@@ -12993,16 +13568,47 @@ static struct snd_kcontrol_new alc269_eeepc_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new alc269vb_laptop_mixer[] = {
+        HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
+        { } /* end */
+};
+
 /* capture mixer elements */
-static struct snd_kcontrol_new alc269_epc_capture_mixer[] = {
+static struct snd_kcontrol_new alc269_laptop_analog_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("IntMic Boost", 0x19, 0, HDA_INPUT),
+        { } /* end */
+};
+
+static struct snd_kcontrol_new alc269_laptop_digital_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        { } /* end */
+};
+
+static struct snd_kcontrol_new alc269vb_laptop_analog_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("IntMic Boost", 0x19, 0, HDA_INPUT),
+        { } /* end */
+};
+
+static struct snd_kcontrol_new alc269vb_laptop_digital_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
         { } /* end */
 };
 
 /* FSC amilo */
-#define alc269_fujitsu_mixer    alc269_eeepc_mixer
+#define alc269_fujitsu_mixer    alc269_laptop_mixer
 
 static struct hda_verb alc269_quanta_fl1_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
@@ -13034,13 +13640,12 @@ static void alc269_quanta_fl1_speaker_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) & 0x80000000;
-        bits = present ? AMP_IN_MUTE(0) : 0;
+        present = snd_hda_jack_detect(codec, 0x15);
+        bits = present ? HDA_AMP_MUTE : 0;
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                        AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                        AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
 
         snd_hda_codec_write(codec, 0x20, 0,
                         AC_VERB_SET_COEF_INDEX, 0x0c);
@@ -13060,18 +13665,16 @@ static void alc269_lifebook_speaker_automute(struct hda_codec *codec)
         unsigned char bits;
 
         /* Check laptop headphone socket */
-        present = snd_hda_codec_read(codec, 0x15, 0,
-                        AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        present = snd_hda_jack_detect(codec, 0x15);
 
         /* Check port replicator headphone socket */
-        present |= snd_hda_codec_read(codec, 0x1a, 0,
-                        AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        present |= snd_hda_jack_detect(codec, 0x1a);
 
-        bits = present ? AMP_IN_MUTE(0) : 0;
+        bits = present ? HDA_AMP_MUTE : 0;
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                        AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                        AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
 
         snd_hda_codec_write(codec, 0x20, 0,
                         AC_VERB_SET_COEF_INDEX, 0x0c);
@@ -13089,11 +13692,8 @@ static void alc269_lifebook_mic_autoswitch(struct hda_codec *codec)
         unsigned int present_laptop;
         unsigned int present_dock;
 
-        present_laptop = snd_hda_codec_read(codec, 0x18, 0,
-                                AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-
-        present_dock = snd_hda_codec_read(codec, 0x1b, 0,
-                                AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        present_laptop  = snd_hda_jack_detect(codec, 0x18);
+        present_dock    = snd_hda_jack_detect(codec, 0x1b);
 
         /* Laptop mic port overrides dock mic port, design decision */
         if (present_dock)
@@ -13132,6 +13732,8 @@ static void alc269_lifebook_unsol_event(struct hda_codec *codec,
 static void alc269_quanta_fl1_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x14;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x19;
@@ -13151,7 +13753,7 @@ static void alc269_lifebook_init_hook(struct hda_codec *codec)
         alc269_lifebook_mic_autoswitch(codec);
 }
 
-static struct hda_verb alc269_eeepc_dmic_init_verbs[] = {
+static struct hda_verb alc269_laptop_dmic_init_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x23, AC_VERB_SET_CONNECT_SEL, 0x05},
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
@@ -13162,7 +13764,7 @@ static struct hda_verb alc269_eeepc_dmic_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc269_eeepc_amic_init_verbs[] = {
+static struct hda_verb alc269_laptop_amic_init_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x23, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
@@ -13172,23 +13774,46 @@ static struct hda_verb alc269_eeepc_amic_init_verbs[] = {
         {}
 };
 
+static struct hda_verb alc269vb_laptop_dmic_init_verbs[] = {
+        {0x21, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x22, AC_VERB_SET_CONNECT_SEL, 0x06},
+        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7019 | (0x00 << 8))},
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {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 alc269vb_laptop_amic_init_verbs[] = {
+        {0x21, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x22, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7019 | (0x00 << 8))},
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
+        {0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
+        {}
+};
+
 /* toggle speaker-output according to the hp-jack state */
 static void alc269_speaker_automute(struct hda_codec *codec)
 {
+        struct alc_spec *spec = codec->spec;
+        unsigned int nid = spec->autocfg.hp_pins[0];
         unsigned int present;
         unsigned char bits;
 
-        present = snd_hda_codec_read(codec, 0x15, 0,
-                                AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? AMP_IN_MUTE(0) : 0;
+        present = snd_hda_jack_detect(codec, nid);
+        bits = present ? HDA_AMP_MUTE : 0;
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
 }
 
 /* unsolicited event for HP jack sensing */
-static void alc269_eeepc_unsol_event(struct hda_codec *codec,
+static void alc269_laptop_unsol_event(struct hda_codec *codec,
                                      unsigned int res)
 {
         switch (res >> 26) {
@@ -13201,9 +13826,23 @@ static void alc269_eeepc_unsol_event(struct hda_codec *codec,
         }
 }
 
-static void alc269_eeepc_dmic_setup(struct hda_codec *codec)
+static void alc269_laptop_amic_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x19;
+        spec->int_mic.mux_idx = 1;
+        spec->auto_mic = 1;
+}
+
+static void alc269_laptop_dmic_setup(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x14;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x12;
@@ -13211,9 +13850,11 @@ static void alc269_eeepc_dmic_setup(struct hda_codec *codec)
         spec->auto_mic = 1;
 }
 
-static void alc269_eeepc_amic_setup(struct hda_codec *codec)
+static void alc269vb_laptop_amic_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x21;
+        spec->autocfg.speaker_pins[0] = 0x14;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x19;
@@ -13221,7 +13862,19 @@ static void alc269_eeepc_amic_setup(struct hda_codec *codec)
         spec->auto_mic = 1;
 }
 
-static void alc269_eeepc_inithook(struct hda_codec *codec)
+static void alc269vb_laptop_dmic_setup(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x21;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x12;
+        spec->int_mic.mux_idx = 6;
+        spec->auto_mic = 1;
+}
+
+static void alc269_laptop_inithook(struct hda_codec *codec)
 {
         alc269_speaker_automute(codec);
         alc_mic_automute(codec);
@@ -13234,22 +13887,10 @@ 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)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
         /*
-         * Set up output mixers (0x0c - 0x0e)
+         * Set up output mixers (0x02 - 0x03)
          */
         /* set vol=0 to output mixers */
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
@@ -13274,26 +13915,57 @@ static struct hda_verb alc269_init_verbs[] = {
 
         {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 Mux-type input source selection */
+        /* Mixer elements: 0x18, 19, 1a, 1b, 1d, 0b */
+        /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+        {0x23, AC_VERB_SET_CONNECT_SEL, 0x00},
 
-        /* FIXME: use matrix-type input source selection */
+        /* set EAPD */
+        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
+        { }
+};
+
+static struct hda_verb alc269vb_init_verbs[] = {
+        /*
+         * Unmute ADC0 and set the default input to mic-in
+         */
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+        /*
+         * Set up output mixers (0x02 - 0x03)
+         */
+        /* 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)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x21, 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},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        /* FIXME: use Mux-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_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)},
+        {0x22, AC_VERB_SET_CONNECT_SEL, 0x00},
 
         /* set EAPD */
         {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
-        {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
         { }
 };
 
@@ -13362,11 +14034,21 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         if (spec->kctls.list)
                 add_mixer(spec, spec->kctls.list);
 
-        add_verb(spec, alc269_init_verbs);
+        if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010) {
+                add_verb(spec, alc269vb_init_verbs);
+                alc_ssid_check(codec, 0, 0x1b, 0x14, 0x21);
+        } else {
+                add_verb(spec, alc269_init_verbs);
+                alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);
+        }
+
         spec->num_mux_defs = 1;
         spec->input_mux = &spec->private_imux[0];
+        fillup_priv_adc_nids(codec, alc269_adc_candidates,
+                             sizeof(alc269_adc_candidates));
+
         /* set default input source */
-        snd_hda_codec_write_cache(codec, alc269_capsrc_nids[0],
+        snd_hda_codec_write_cache(codec, spec->capsrc_nids[0],
                                   0, AC_VERB_SET_CONNECT_SEL,
                                   spec->input_mux->items[0].index);
 
@@ -13377,8 +14059,6 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         if (!spec->cap_mixer && !spec->no_analog)
                 set_capture_mixer(codec);
 
-        alc_ssid_check(codec, 0x15, 0x1b, 0x14);
-
         return 1;
 }
 
@@ -13398,14 +14078,35 @@ static void alc269_auto_init(struct hda_codec *codec)
                 alc_inithook(codec);
 }
 
+enum {
+        ALC269_FIXUP_SONY_VAIO,
+};
+
+const static struct hda_verb alc269_sony_vaio_fixup_verbs[] = {
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},
+        {}
+};
+
+static const struct alc_fixup alc269_fixups[] = {
+        [ALC269_FIXUP_SONY_VAIO] = {
+                .verbs = alc269_sony_vaio_fixup_verbs
+        },
+};
+
+static struct snd_pci_quirk alc269_fixup_tbl[] = {
+        SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
+        {}
+};
+
+
 /*
  * configuration and preset
  */
 static const char *alc269_models[ALC269_MODEL_LAST] = {
         [ALC269_BASIC]                  = "basic",
         [ALC269_QUANTA_FL1]             = "quanta",
-        [ALC269_ASUS_EEEPC_P703]        = "eeepc-p703",
-        [ALC269_ASUS_EEEPC_P901]        = "eeepc-p901",
+        [ALC269_AMIC]                   = "laptop-amic",
+        [ALC269_DMIC]                   = "laptop-dmic",
         [ALC269_FUJITSU]                = "fujitsu",
         [ALC269_LIFEBOOK]               = "lifebook",
         [ALC269_AUTO]                   = "auto",
@@ -13414,20 +14115,57 @@ static const char *alc269_models[ALC269_MODEL_LAST] = {
 static struct snd_pci_quirk alc269_cfg_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_QUANTA_FL1),
         SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",
-                      ALC269_ASUS_EEEPC_P703),
-        SND_PCI_QUIRK(0x1043, 0x1883, "ASUS F81Se", ALC269_ASUS_EEEPC_P703),
-        SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS F5Q", ALC269_ASUS_EEEPC_P703),
-        SND_PCI_QUIRK(0x1043, 0x1723, "ASUS P80", ALC269_ASUS_EEEPC_P703),
-        SND_PCI_QUIRK(0x1043, 0x1773, "ASUS U20A", ALC269_ASUS_EEEPC_P703),
-        SND_PCI_QUIRK(0x1043, 0x1743, "ASUS U80", ALC269_ASUS_EEEPC_P703),
-        SND_PCI_QUIRK(0x1043, 0x1653, "ASUS U50", ALC269_ASUS_EEEPC_P703),
+                      ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1013, "ASUS N61Da", ALC269VB_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1113, "ASUS N63Jn", ALC269VB_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1143, "ASUS B53f", ALC269VB_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1133, "ASUS UJ20ft", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1183, "ASUS K72DR", ALC269VB_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x11b3, "ASUS K52DR", ALC269VB_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x11e3, "ASUS U33Jc", ALC269VB_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1273, "ASUS UL80Jt", ALC269VB_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1283, "ASUS U53Jc", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS N82Jv", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x12d3, "ASUS N61Jv", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x13a3, "ASUS UL30Vt", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1373, "ASUS G73JX", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1383, "ASUS UJ30Jc", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x13d3, "ASUS N61JA", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1413, "ASUS UL50", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1443, "ASUS UL30", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1453, "ASUS M60Jv", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1483, "ASUS UL80", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x14f3, "ASUS F83Vf", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x14e3, "ASUS UL20", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1513, "ASUS UX30", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1593, "ASUS N51Vn", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x15a3, "ASUS N60Jv", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x15b3, "ASUS N60Dp", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x15c3, "ASUS N70De", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x15e3, "ASUS F83T", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1643, "ASUS M60J", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1653, "ASUS U50", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1693, "ASUS F50N", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS F5Q", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_DMIC),
+        SND_PCI_QUIRK(0x1043, 0x1723, "ASUS P80", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1743, "ASUS U80", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1773, "ASUS U20A", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x1883, "ASUS F81Se", ALC269_AMIC),
         SND_PCI_QUIRK(0x1043, 0x831a, "ASUS Eeepc P901",
-                      ALC269_ASUS_EEEPC_P901),
+                      ALC269_DMIC),
         SND_PCI_QUIRK(0x1043, 0x834a, "ASUS Eeepc S101",
-                      ALC269_ASUS_EEEPC_P901),
-        SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_ASUS_EEEPC_P901),
-        SND_PCI_QUIRK(0x1734, 0x115d, "FSC Amilo", ALC269_FUJITSU),
+                      ALC269_DMIC),
+        SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005HA", ALC269_DMIC),
+        SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005HA", ALC269_DMIC),
+        SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_AUTO),
         SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook ICH9M-based", ALC269_LIFEBOOK),
+        SND_PCI_QUIRK(0x152d, 0x1778, "Quanta ON1", ALC269_DMIC),
+        SND_PCI_QUIRK(0x1734, 0x115d, "FSC Amilo", ALC269_FUJITSU),
+        SND_PCI_QUIRK(0x17aa, 0x3be9, "Quanta Wistron", ALC269_AMIC),
+        SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_AMIC),
+        SND_PCI_QUIRK(0x17ff, 0x059a, "Quanta EL3", ALC269_DMIC),
+        SND_PCI_QUIRK(0x17ff, 0x059b, "Quanta JR1", ALC269_DMIC),
         {}
 };
 
@@ -13455,47 +14193,75 @@ static struct alc_config_preset alc269_presets[] = {
                 .setup = alc269_quanta_fl1_setup,
                 .init_hook = alc269_quanta_fl1_init_hook,
         },
-        [ALC269_ASUS_EEEPC_P703] = {
-                .mixers = { alc269_eeepc_mixer },
-                .cap_mixer = alc269_epc_capture_mixer,
+        [ALC269_AMIC] = {
+                .mixers = { alc269_laptop_mixer },
+                .cap_mixer = alc269_laptop_analog_capture_mixer,
                 .init_verbs = { alc269_init_verbs,
-                                alc269_eeepc_amic_init_verbs },
+                                alc269_laptop_amic_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,
-                .unsol_event = alc269_eeepc_unsol_event,
-                .setup = alc269_eeepc_amic_setup,
-                .init_hook = alc269_eeepc_inithook,
+                .unsol_event = alc269_laptop_unsol_event,
+                .setup = alc269_laptop_amic_setup,
+                .init_hook = alc269_laptop_inithook,
         },
-        [ALC269_ASUS_EEEPC_P901] = {
-                .mixers = { alc269_eeepc_mixer },
-                .cap_mixer = alc269_epc_capture_mixer,
+        [ALC269_DMIC] = {
+                .mixers = { alc269_laptop_mixer },
+                .cap_mixer = alc269_laptop_digital_capture_mixer,
                 .init_verbs = { alc269_init_verbs,
-                                alc269_eeepc_dmic_init_verbs },
+                                alc269_laptop_dmic_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,
-                .unsol_event = alc269_eeepc_unsol_event,
-                .setup = alc269_eeepc_dmic_setup,
-                .init_hook = alc269_eeepc_inithook,
+                .unsol_event = alc269_laptop_unsol_event,
+                .setup = alc269_laptop_dmic_setup,
+                .init_hook = alc269_laptop_inithook,
+        },
+        [ALC269VB_AMIC] = {
+                .mixers = { alc269vb_laptop_mixer },
+                .cap_mixer = alc269vb_laptop_analog_capture_mixer,
+                .init_verbs = { alc269vb_init_verbs,
+                                alc269vb_laptop_amic_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,
+                .unsol_event = alc269_laptop_unsol_event,
+                .setup = alc269vb_laptop_amic_setup,
+                .init_hook = alc269_laptop_inithook,
+        },
+        [ALC269VB_DMIC] = {
+                .mixers = { alc269vb_laptop_mixer },
+                .cap_mixer = alc269vb_laptop_digital_capture_mixer,
+                .init_verbs = { alc269vb_init_verbs,
+                                alc269vb_laptop_dmic_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,
+                .unsol_event = alc269_laptop_unsol_event,
+                .setup = alc269vb_laptop_dmic_setup,
+                .init_hook = alc269_laptop_inithook,
         },
         [ALC269_FUJITSU] = {
                 .mixers = { alc269_fujitsu_mixer },
-                .cap_mixer = alc269_epc_capture_mixer,
+                .cap_mixer = alc269_laptop_digital_capture_mixer,
                 .init_verbs = { alc269_init_verbs,
-                                alc269_eeepc_dmic_init_verbs },
+                                alc269_laptop_dmic_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,
-                .unsol_event = alc269_eeepc_unsol_event,
-                .setup = alc269_eeepc_dmic_setup,
-                .init_hook = alc269_eeepc_inithook,
+                .unsol_event = alc269_laptop_unsol_event,
+                .setup = alc269_laptop_dmic_setup,
+                .init_hook = alc269_laptop_inithook,
         },
         [ALC269_LIFEBOOK] = {
                 .mixers = { alc269_lifebook_mixer },
@@ -13516,6 +14282,7 @@ static int patch_alc269(struct hda_codec *codec)
         struct alc_spec *spec;
         int board_config;
         int err;
+        int is_alc269vb = 0;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -13525,6 +14292,16 @@ static int patch_alc269(struct hda_codec *codec)
 
         alc_fix_pll_init(codec, 0x20, 0x04, 15);
 
+        if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010){
+                kfree(codec->chip_name);
+                codec->chip_name = kstrdup("ALC259", GFP_KERNEL);
+                if (!codec->chip_name) {
+                        alc_free(codec);
+                        return -ENOMEM;
+                }
+                is_alc269vb = 1;
+        }
+
         board_config = snd_hda_check_board_config(codec, ALC269_MODEL_LAST,
                                                   alc269_models,
                                                   alc269_cfg_tbl);
@@ -13535,6 +14312,9 @@ static int patch_alc269(struct hda_codec *codec)
                 board_config = ALC269_AUTO;
         }
 
+        if (board_config == ALC269_AUTO)
+                alc_pick_fixup(codec, alc269_fixup_tbl, alc269_fixups, 1);
+
         if (board_config == ALC269_AUTO) {
                 /* automatic parse from the BIOS config */
                 err = alc269_parse_auto_config(codec);
@@ -13558,7 +14338,7 @@ static int patch_alc269(struct hda_codec *codec)
         if (board_config != ALC269_AUTO)
                 setup_preset(codec, &alc269_presets[board_config]);
 
-        if (codec->subsystem_id == 0x17aa3bf8) {
+        if (board_config == ALC269_QUANTA_FL1) {
                 /* Due to a hardware problem on Lenovo Ideadpad, we need to
                  * fix the sample rate of analog I/O to 44.1kHz
                  */
@@ -13571,13 +14351,25 @@ static int patch_alc269(struct hda_codec *codec)
         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->capsrc_nids = alc269_capsrc_nids;
+        if (!spec->adc_nids) { /* wasn't filled automatically? use default */
+                if (!is_alc269vb) {
+                        spec->adc_nids = alc269_adc_nids;
+                        spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids);
+                        spec->capsrc_nids = alc269_capsrc_nids;
+                } else {
+                        spec->adc_nids = alc269vb_adc_nids;
+                        spec->num_adc_nids = ARRAY_SIZE(alc269vb_adc_nids);
+                        spec->capsrc_nids = alc269vb_capsrc_nids;
+                }
+        }
+
         if (!spec->cap_mixer)
                 set_capture_mixer(codec);
         set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
 
+        if (board_config == ALC269_AUTO)
+                alc_pick_fixup(codec, alc269_fixup_tbl, alc269_fixups, 0);
+
         spec->vmaster_nid = 0x02;
 
         codec->patch_ops = alc_patch_ops;
@@ -13587,7 +14379,6 @@ static int patch_alc269(struct hda_codec *codec)
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc269_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
 }
@@ -14157,10 +14948,8 @@ static struct hda_verb alc861_toshiba_init_verbs[] = {
 /* toggle speaker-output according to the hp-jack state */
 static void alc861_toshiba_automute(struct hda_codec *codec)
 {
-        unsigned int present;
+        unsigned int present = snd_hda_jack_detect(codec, 0x0f);
 
-        present = snd_hda_codec_read(codec, 0x0f, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
         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,
@@ -14260,9 +15049,7 @@ static int alc861_auto_fill_dac_nids(struct hda_codec *codec,
 static int alc861_create_out_sw(struct hda_codec *codec, const char *pfx,
                                 hda_nid_t nid, unsigned int chs)
 {
-        char name[32];
-        snprintf(name, sizeof(name), "%s Playback Switch", pfx);
-        return add_control(codec->spec, ALC_CTL_WIDGET_MUTE, name,
+        return add_pb_sw_ctrl(codec->spec, ALC_CTL_WIDGET_MUTE, pfx,
                            HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT));
 }
 
@@ -14454,7 +15241,7 @@ static int alc861_parse_auto_config(struct hda_codec *codec)
         spec->num_adc_nids = ARRAY_SIZE(alc861_adc_nids);
         set_capture_mixer(codec);
 
-        alc_ssid_check(codec, 0x0e, 0x0f, 0x0b);
+        alc_ssid_check(codec, 0x0e, 0x0f, 0x0b, 0);
 
         return 1;
 }
@@ -14627,6 +15414,27 @@ static struct alc_config_preset alc861_presets[] = {
         },
 };
 
+/* Pin config fixes */
+enum {
+        PINFIX_FSC_AMILO_PI1505,
+};
+
+static struct alc_pincfg alc861_fsc_amilo_pi1505_pinfix[] = {
+        { 0x0b, 0x0221101f }, /* HP */
+        { 0x0f, 0x90170310 }, /* speaker */
+        { }
+};
+
+static const struct alc_fixup alc861_fixups[] = {
+        [PINFIX_FSC_AMILO_PI1505] = {
+                .pins = alc861_fsc_amilo_pi1505_pinfix
+        },
+};
+
+static struct snd_pci_quirk alc861_fixup_tbl[] = {
+        SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505),
+        {}
+};
 
 static int patch_alc861(struct hda_codec *codec)
 {
@@ -14650,6 +15458,9 @@ static int patch_alc861(struct hda_codec *codec)
                 board_config = ALC861_AUTO;
         }
 
+        if (board_config == ALC861_AUTO)
+                alc_pick_fixup(codec, alc861_fixup_tbl, alc861_fixups, 1);
+
         if (board_config == ALC861_AUTO) {
                 /* automatic parse from the BIOS config */
                 err = alc861_parse_auto_config(codec);
@@ -14679,18 +15490,26 @@ static int patch_alc861(struct hda_codec *codec)
         spec->stream_digital_playback = &alc861_pcm_digital_playback;
         spec->stream_digital_capture = &alc861_pcm_digital_capture;
 
+        if (!spec->cap_mixer)
+                set_capture_mixer(codec);
         set_beep_amp(spec, 0x23, 0, HDA_OUTPUT);
 
         spec->vmaster_nid = 0x03;
 
-        codec->patch_ops = alc_patch_ops;
         if (board_config == ALC861_AUTO)
+                alc_pick_fixup(codec, alc861_fixup_tbl, alc861_fixups, 0);
+
+        codec->patch_ops = alc_patch_ops;
+        if (board_config == ALC861_AUTO) {
                 spec->init_hook = alc861_auto_init;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
+                spec->power_hook = alc_power_eapd;
+#endif
+        }
+#ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc861_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
 }
@@ -15067,9 +15886,9 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x18);
         bits = present ? HDA_AMP_MUTE : 0;
+
         snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1,
                                  HDA_AMP_MUTE, bits);
 }
@@ -15386,7 +16205,6 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec)
 static int alc861vd_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", "CLFE", "Side"};
         hda_nid_t nid_v, nid_s;
         int i, err;
@@ -15403,26 +16221,26 @@ static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
 
                 if (i == 2) {
                         /* Center/LFE */
-                        err = add_control(spec, ALC_CTL_WIDGET_VOL,
-                                          "Center Playback Volume",
+                        err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,
+                                              "Center",
                                           HDA_COMPOSE_AMP_VAL(nid_v, 1, 0,
                                                               HDA_OUTPUT));
                         if (err < 0)
                                 return err;
-                        err = add_control(spec, ALC_CTL_WIDGET_VOL,
-                                          "LFE Playback Volume",
+                        err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,
+                                              "LFE",
                                           HDA_COMPOSE_AMP_VAL(nid_v, 2, 0,
                                                               HDA_OUTPUT));
                         if (err < 0)
                                 return err;
-                        err = add_control(spec, ALC_CTL_BIND_MUTE,
-                                          "Center Playback Switch",
+                        err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,
+                                             "Center",
                                           HDA_COMPOSE_AMP_VAL(nid_s, 1, 2,
                                                               HDA_INPUT));
                         if (err < 0)
                                 return err;
-                        err = add_control(spec, ALC_CTL_BIND_MUTE,
-                                          "LFE Playback Switch",
+                        err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,
+                                             "LFE",
                                           HDA_COMPOSE_AMP_VAL(nid_s, 2, 2,
                                                               HDA_INPUT));
                         if (err < 0)
@@ -15437,8 +16255,7 @@ static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
                                         pfx = "PCM";
                         } else
                                 pfx = chname[i];
-                        sprintf(name, "%s Playback Volume", pfx);
-                        err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                        err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,
                                           HDA_COMPOSE_AMP_VAL(nid_v, 3, 0,
                                                               HDA_OUTPUT));
                         if (err < 0)
@@ -15446,8 +16263,7 @@ static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
                         if (cfg->line_outs == 1 &&
                             cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
                                 pfx = "Speaker";
-                        sprintf(name, "%s Playback Switch", pfx);
-                        err = add_control(spec, ALC_CTL_BIND_MUTE, name,
+                        err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, pfx,
                                           HDA_COMPOSE_AMP_VAL(nid_s, 3, 2,
                                                               HDA_INPUT));
                         if (err < 0)
@@ -15465,7 +16281,6 @@ static int alc861vd_auto_create_extra_out(struct alc_spec *spec,
 {
         hda_nid_t nid_v, nid_s;
         int err;
-        char name[32];
 
         if (!pin)
                 return 0;
@@ -15483,21 +16298,18 @@ static int alc861vd_auto_create_extra_out(struct alc_spec *spec,
                 nid_s = alc861vd_idx_to_mixer_switch(
                                 alc880_fixed_pin_idx(pin));
 
-                sprintf(name, "%s Playback Volume", pfx);
-                err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,
                                   HDA_COMPOSE_AMP_VAL(nid_v, 3, 0, HDA_OUTPUT));
                 if (err < 0)
                         return err;
-                sprintf(name, "%s Playback Switch", pfx);
-                err = add_control(spec, ALC_CTL_BIND_MUTE, name,
+                err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, pfx,
                                   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);
-                err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+                err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx,
                                   HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
                 if (err < 0)
                         return err;
@@ -15560,7 +16372,7 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
-        alc_ssid_check(codec, 0x15, 0x1b, 0x14);
+        alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);
 
         return 1;
 }
@@ -15621,7 +16433,8 @@ static int patch_alc861vd(struct hda_codec *codec)
                 board_config = ALC861VD_AUTO;
         }
 
-        alc_pick_fixup(codec, alc861vd_fixup_tbl, alc861vd_fixups);
+        if (board_config == ALC861VD_AUTO)
+                alc_pick_fixup(codec, alc861vd_fixup_tbl, alc861vd_fixups, 1);
 
         if (board_config == ALC861VD_AUTO) {
                 /* automatic parse from the BIOS config */
@@ -15669,6 +16482,9 @@ static int patch_alc861vd(struct hda_codec *codec)
 
         spec->vmaster_nid = 0x02;
 
+        if (board_config == ALC861VD_AUTO)
+                alc_pick_fixup(codec, alc861vd_fixup_tbl, alc861vd_fixups, 0);
+
         codec->patch_ops = alc_patch_ops;
 
         if (board_config == ALC861VD_AUTO)
@@ -15677,7 +16493,6 @@ static int patch_alc861vd(struct hda_codec *codec)
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc861vd_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
 }
@@ -16083,6 +16898,52 @@ static struct snd_kcontrol_new alc663_g50v_mixer[] = {
         { } /* end */
 };
 
+static struct hda_bind_ctls alc663_asus_mode7_8_all_bind_switch = {
+        .ops = &snd_hda_bind_sw,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
+
+static struct hda_bind_ctls alc663_asus_mode7_8_sp_bind_switch = {
+        .ops = &snd_hda_bind_sw,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
+
+static struct snd_kcontrol_new alc663_mode7_mixer[] = {
+        HDA_BIND_SW("Master Playback Switch", &alc663_asus_mode7_8_all_bind_switch),
+        HDA_BIND_VOL("Speaker Playback Volume", &alc663_asus_bind_master_vol),
+        HDA_BIND_SW("Speaker Playback Switch", &alc663_asus_mode7_8_sp_bind_switch),
+        HDA_CODEC_MUTE("Headphone1 Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone2 Playback Switch", 0x21, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("IntMic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("IntMic 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 snd_kcontrol_new alc663_mode8_mixer[] = {
+        HDA_BIND_SW("Master Playback Switch", &alc663_asus_mode7_8_all_bind_switch),
+        HDA_BIND_VOL("Speaker Playback Volume", &alc663_asus_bind_master_vol),
+        HDA_BIND_SW("Speaker Playback Switch", &alc663_asus_mode7_8_sp_bind_switch),
+        HDA_CODEC_MUTE("Headphone1 Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone2 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),
+        { } /* end */
+};
+
+
 static struct snd_kcontrol_new alc662_chmode_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -16098,13 +16959,6 @@ 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)},
@@ -16154,6 +17008,28 @@ static struct hda_verb alc662_init_verbs[] = {
         { }
 };
 
+static struct hda_verb alc663_init_verbs[] = {
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        { }
+};
+
+static struct hda_verb alc272_init_verbs[] = {
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        { }
+};
+
 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},
@@ -16173,61 +17049,6 @@ static struct hda_verb alc662_eeepc_ep20_sue_init_verbs[] = {
         {}
 };
 
-/*
- * 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)},
-        { }
-};
-
-/* additional verbs for ALC663 */
-static struct hda_verb alc663_auto_init_verbs[] = {
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        { }
-};
-
 static struct hda_verb alc663_m51va_init_verbs[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
@@ -16370,6 +17191,45 @@ static struct hda_verb alc272_dell_init_verbs[] = {
         {}
 };
 
+static struct hda_verb alc663_mode7_init_verbs[] = {
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1b, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {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, 0x01},  /* Headphone */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},
+        {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
+        {0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
+        {}
+};
+
+static struct hda_verb alc663_mode8_init_verbs[] = {
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {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},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {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, 0x01},  /* Headphone */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},
+        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_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 snd_kcontrol_new alc662_auto_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
@@ -16387,9 +17247,9 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x14);
         bits = present ? HDA_AMP_MUTE : 0;
+
         snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
                                  HDA_AMP_MUTE, bits);
 }
@@ -16399,9 +17259,9 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x1b);
         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,
@@ -16460,14 +17320,12 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x21);
         bits = present ? HDA_AMP_MUTE : 0;
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
 }
 
 static void alc663_21jd_two_speaker_automute(struct hda_codec *codec)
@@ -16475,18 +17333,16 @@ static void alc663_21jd_two_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;
+        present = snd_hda_jack_detect(codec, 0x21);
         bits = present ? HDA_AMP_MUTE : 0;
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 0,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 1,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
 }
 
 static void alc663_15jd_two_speaker_automute(struct hda_codec *codec)
@@ -16494,18 +17350,16 @@ static void alc663_15jd_two_speaker_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;
+        present = snd_hda_jack_detect(codec, 0x15);
         bits = present ? HDA_AMP_MUTE : 0;
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 0,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
         snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 1,
-                                AMP_IN_MUTE(0), bits);
+                                 HDA_AMP_MUTE, bits);
 }
 
 static void alc662_f5z_speaker_automute(struct hda_codec *codec)
@@ -16513,9 +17367,7 @@ static void alc662_f5z_speaker_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)
-                        & AC_PINSENSE_PRESENCE;
+        present = snd_hda_jack_detect(codec, 0x1b);
         bits = present ? 0 : PIN_OUT;
         snd_hda_codec_write(codec, 0x14, 0,
                          AC_VERB_SET_PIN_WIDGET_CONTROL, bits);
@@ -16525,12 +17377,8 @@ static void alc663_two_hp_m1_speaker_automute(struct hda_codec *codec)
 {
         unsigned int present1, present2;
 
-        present1 = snd_hda_codec_read(codec, 0x21, 0,
-                        AC_VERB_GET_PIN_SENSE, 0)
-                        & AC_PINSENSE_PRESENCE;
-        present2 = snd_hda_codec_read(codec, 0x15, 0,
-                        AC_VERB_GET_PIN_SENSE, 0)
-                        & AC_PINSENSE_PRESENCE;
+        present1 = snd_hda_jack_detect(codec, 0x21);
+        present2 = snd_hda_jack_detect(codec, 0x15);
 
         if (present1 || present2) {
                 snd_hda_codec_write_cache(codec, 0x14, 0,
@@ -16545,23 +17393,67 @@ static void alc663_two_hp_m2_speaker_automute(struct hda_codec *codec)
 {
         unsigned int present1, present2;
 
-        present1 = snd_hda_codec_read(codec, 0x1b, 0,
-                                AC_VERB_GET_PIN_SENSE, 0)
-                                & AC_PINSENSE_PRESENCE;
-        present2 = snd_hda_codec_read(codec, 0x15, 0,
-                                AC_VERB_GET_PIN_SENSE, 0)
-                                & AC_PINSENSE_PRESENCE;
+        present1 = snd_hda_jack_detect(codec, 0x1b);
+        present2 = snd_hda_jack_detect(codec, 0x15);
 
         if (present1 || present2) {
                 snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                AMP_IN_MUTE(0), AMP_IN_MUTE(0));
+                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
                 snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                AMP_IN_MUTE(0), AMP_IN_MUTE(0));
+                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
         } else {
                 snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                AMP_IN_MUTE(0), 0);
+                                         HDA_AMP_MUTE, 0);
                 snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                AMP_IN_MUTE(0), 0);
+                                         HDA_AMP_MUTE, 0);
+        }
+}
+
+static void alc663_two_hp_m7_speaker_automute(struct hda_codec *codec)
+{
+        unsigned int present1, present2;
+
+        present1 = snd_hda_codec_read(codec, 0x1b, 0,
+                        AC_VERB_GET_PIN_SENSE, 0)
+                        & AC_PINSENSE_PRESENCE;
+        present2 = snd_hda_codec_read(codec, 0x21, 0,
+                        AC_VERB_GET_PIN_SENSE, 0)
+                        & AC_PINSENSE_PRESENCE;
+
+        if (present1 || present2) {
+                snd_hda_codec_write_cache(codec, 0x14, 0,
+                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
+                snd_hda_codec_write_cache(codec, 0x17, 0,
+                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
+        } else {
+                snd_hda_codec_write_cache(codec, 0x14, 0,
+                        AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+                snd_hda_codec_write_cache(codec, 0x17, 0,
+                        AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+        }
+}
+
+static void alc663_two_hp_m8_speaker_automute(struct hda_codec *codec)
+{
+        unsigned int present1, present2;
+
+        present1 = snd_hda_codec_read(codec, 0x21, 0,
+                        AC_VERB_GET_PIN_SENSE, 0)
+                        & AC_PINSENSE_PRESENCE;
+        present2 = snd_hda_codec_read(codec, 0x15, 0,
+                        AC_VERB_GET_PIN_SENSE, 0)
+                        & AC_PINSENSE_PRESENCE;
+
+        if (present1 || present2) {
+                snd_hda_codec_write_cache(codec, 0x14, 0,
+                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
+                snd_hda_codec_write_cache(codec, 0x17, 0,
+                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
+        } else {
+                snd_hda_codec_write_cache(codec, 0x14, 0,
+                        AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+                snd_hda_codec_write_cache(codec, 0x17, 0,
+                        AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
         }
 }
 
@@ -16584,7 +17476,7 @@ static void alc663_m51va_setup(struct hda_codec *codec)
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x12;
-        spec->int_mic.mux_idx = 1;
+        spec->int_mic.mux_idx = 9;
         spec->auto_mic = 1;
 }
 
@@ -16596,7 +17488,17 @@ static void alc663_m51va_inithook(struct hda_codec *codec)
 
 /* ***************** Mode1 ******************************/
 #define alc663_mode1_unsol_event        alc663_m51va_unsol_event
-#define alc663_mode1_setup              alc663_m51va_setup
+
+static void alc663_mode1_setup(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x19;
+        spec->int_mic.mux_idx = 1;
+        spec->auto_mic = 1;
+}
+
 #define alc663_mode1_inithook           alc663_m51va_inithook
 
 /* ***************** Mode2 ******************************/
@@ -16613,7 +17515,7 @@ static void alc662_mode2_unsol_event(struct hda_codec *codec,
         }
 }
 
-#define alc662_mode2_setup      alc663_m51va_setup
+#define alc662_mode2_setup      alc663_mode1_setup
 
 static void alc662_mode2_inithook(struct hda_codec *codec)
 {
@@ -16634,7 +17536,7 @@ static void alc663_mode3_unsol_event(struct hda_codec *codec,
         }
 }
 
-#define alc663_mode3_setup      alc663_m51va_setup
+#define alc663_mode3_setup      alc663_mode1_setup
 
 static void alc663_mode3_inithook(struct hda_codec *codec)
 {
@@ -16655,7 +17557,7 @@ static void alc663_mode4_unsol_event(struct hda_codec *codec,
         }
 }
 
-#define alc663_mode4_setup      alc663_m51va_setup
+#define alc663_mode4_setup      alc663_mode1_setup
 
 static void alc663_mode4_inithook(struct hda_codec *codec)
 {
@@ -16676,7 +17578,7 @@ static void alc663_mode5_unsol_event(struct hda_codec *codec,
         }
 }
 
-#define alc663_mode5_setup      alc663_m51va_setup
+#define alc663_mode5_setup      alc663_mode1_setup
 
 static void alc663_mode5_inithook(struct hda_codec *codec)
 {
@@ -16697,7 +17599,7 @@ static void alc663_mode6_unsol_event(struct hda_codec *codec,
         }
 }
 
-#define alc663_mode6_setup      alc663_m51va_setup
+#define alc663_mode6_setup      alc663_mode1_setup
 
 static void alc663_mode6_inithook(struct hda_codec *codec)
 {
@@ -16705,14 +17607,56 @@ static void alc663_mode6_inithook(struct hda_codec *codec)
         alc_mic_automute(codec);
 }
 
+/* ***************** Mode7 ******************************/
+static void alc663_mode7_unsol_event(struct hda_codec *codec,
+                                           unsigned int res)
+{
+        switch (res >> 26) {
+        case ALC880_HP_EVENT:
+                alc663_two_hp_m7_speaker_automute(codec);
+                break;
+        case ALC880_MIC_EVENT:
+                alc_mic_automute(codec);
+                break;
+        }
+}
+
+#define alc663_mode7_setup      alc663_mode1_setup
+
+static void alc663_mode7_inithook(struct hda_codec *codec)
+{
+        alc663_two_hp_m7_speaker_automute(codec);
+        alc_mic_automute(codec);
+}
+
+/* ***************** Mode8 ******************************/
+static void alc663_mode8_unsol_event(struct hda_codec *codec,
+                                           unsigned int res)
+{
+        switch (res >> 26) {
+        case ALC880_HP_EVENT:
+                alc663_two_hp_m8_speaker_automute(codec);
+                break;
+        case ALC880_MIC_EVENT:
+                alc_mic_automute(codec);
+                break;
+        }
+}
+
+#define alc663_mode8_setup      alc663_m51va_setup
+
+static void alc663_mode8_inithook(struct hda_codec *codec)
+{
+        alc663_two_hp_m8_speaker_automute(codec);
+        alc_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;
+        present = snd_hda_jack_detect(codec, 0x21);
         bits = present ? HDA_AMP_MUTE : 0;
         snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
                                  HDA_AMP_MUTE, bits);
@@ -16725,9 +17669,7 @@ 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;
+        present = snd_hda_jack_detect(codec, 0x15);
         bits = present ? HDA_AMP_MUTE : 0;
         snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
                                  HDA_AMP_MUTE, bits);
@@ -16843,6 +17785,8 @@ static const char *alc662_models[ALC662_MODEL_LAST] = {
         [ALC663_ASUS_MODE4] = "asus-mode4",
         [ALC663_ASUS_MODE5] = "asus-mode5",
         [ALC663_ASUS_MODE6] = "asus-mode6",
+        [ALC663_ASUS_MODE7] = "asus-mode7",
+        [ALC663_ASUS_MODE8] = "asus-mode8",
         [ALC272_DELL]           = "dell",
         [ALC272_DELL_ZM1]       = "dell-zm1",
         [ALC272_SAMSUNG_NC10]   = "samsung-nc10",
@@ -16855,16 +17799,27 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1028, 0x02f4, "DELL ZM1", ALC272_DELL_ZM1),
         SND_PCI_QUIRK(0x1043, 0x1000, "ASUS N50Vm", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x1092, "ASUS NB", ALC663_ASUS_MODE3),
+        SND_PCI_QUIRK(0x1043, 0x1173, "ASUS K73Jn", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x11c3, "ASUS M70V", ALC663_ASUS_MODE3),
         SND_PCI_QUIRK(0x1043, 0x11d3, "ASUS NB", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x11f3, "ASUS NB", ALC662_ASUS_MODE2),
         SND_PCI_QUIRK(0x1043, 0x1203, "ASUS NB", ALC663_ASUS_MODE1),
+        SND_PCI_QUIRK(0x1043, 0x1303, "ASUS G60J", ALC663_ASUS_MODE1),
+        SND_PCI_QUIRK(0x1043, 0x1333, "ASUS G60Jx", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x1339, "ASUS NB", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x13e3, "ASUS N71JA", ALC663_ASUS_MODE7),
+        SND_PCI_QUIRK(0x1043, 0x1463, "ASUS N71", ALC663_ASUS_MODE7),
+        SND_PCI_QUIRK(0x1043, 0x14d3, "ASUS G72", ALC663_ASUS_MODE8),
+        SND_PCI_QUIRK(0x1043, 0x1563, "ASUS N90", ALC663_ASUS_MODE3),
+        SND_PCI_QUIRK(0x1043, 0x15d3, "ASUS N50SF F50SF", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x16c3, "ASUS NB", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x16f3, "ASUS K40C K50C", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x1733, "ASUS N81De", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x1753, "ASUS NB", ALC662_ASUS_MODE2),
         SND_PCI_QUIRK(0x1043, 0x1763, "ASUS NB", ALC663_ASUS_MODE6),
         SND_PCI_QUIRK(0x1043, 0x1765, "ASUS NB", ALC663_ASUS_MODE6),
         SND_PCI_QUIRK(0x1043, 0x1783, "ASUS NB", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x1793, "ASUS F50GX", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x17b3, "ASUS F70SL", ALC663_ASUS_MODE3),
         SND_PCI_QUIRK(0x1043, 0x17c3, "ASUS UX20", ALC663_ASUS_M51VA),
         SND_PCI_QUIRK(0x1043, 0x17f3, "ASUS X58LE", ALC662_ASUS_MODE2),
@@ -16880,6 +17835,7 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x1893, "ASUS M50Vm", ALC663_ASUS_MODE3),
         SND_PCI_QUIRK(0x1043, 0x1894, "ASUS X55", ALC663_ASUS_MODE3),
         SND_PCI_QUIRK(0x1043, 0x18b3, "ASUS N80Vc", ALC663_ASUS_MODE1),
+        SND_PCI_QUIRK(0x1043, 0x18c3, "ASUS VX5", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x18d3, "ASUS N81Te", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x18f3, "ASUS N505Tp", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x1903, "ASUS F5GL", ALC663_ASUS_MODE1),
@@ -16903,10 +17859,11 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = {
         SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_ECS),
         SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K",
                       ALC662_3ST_6ch_DIG),
-        SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB200", ALC663_ASUS_MODE4),
+        SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB20x", ALC662_AUTO),
         SND_PCI_QUIRK(0x144d, 0xca00, "Samsung NC10", ALC272_SAMSUNG_NC10),
         SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L",
                       ALC662_3ST_6ch_DIG),
+        SND_PCI_QUIRK(0x152d, 0x2304, "Quanta WH1", ALC663_ASUS_H13),
         SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
         SND_PCI_QUIRK(0x1631, 0xc10c, "PB RS65", ALC663_ASUS_M51VA),
         SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo", ALC662_LENOVO_101E),
@@ -17147,6 +18104,36 @@ static struct alc_config_preset alc662_presets[] = {
                 .setup = alc663_mode6_setup,
                 .init_hook = alc663_mode6_inithook,
         },
+        [ALC663_ASUS_MODE7] = {
+                .mixers = { alc663_mode7_mixer },
+                .cap_mixer = alc662_auto_capture_mixer,
+                .init_verbs = { alc662_init_verbs,
+                                alc663_mode7_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc662_dac_nids),
+                .hp_nid = 0x03,
+                .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,
+                .unsol_event = alc663_mode7_unsol_event,
+                .setup = alc663_mode7_setup,
+                .init_hook = alc663_mode7_inithook,
+        },
+        [ALC663_ASUS_MODE8] = {
+                .mixers = { alc663_mode8_mixer },
+                .cap_mixer = alc662_auto_capture_mixer,
+                .init_verbs = { alc662_init_verbs,
+                                alc663_mode8_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc662_dac_nids),
+                .hp_nid = 0x03,
+                .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,
+                .unsol_event = alc663_mode8_unsol_event,
+                .setup = alc663_mode8_setup,
+                .init_hook = alc663_mode8_inithook,
+        },
         [ALC272_DELL] = {
                 .mixers = { alc663_m51va_mixer },
                 .cap_mixer = alc272_auto_capture_mixer,
@@ -17264,21 +18251,17 @@ static int alc662_auto_fill_dac_nids(struct hda_codec *codec,
         return 0;
 }
 
-static int alc662_add_vol_ctl(struct alc_spec *spec, const char *pfx,
+static inline int alc662_add_vol_ctl(struct alc_spec *spec, const char *pfx,
                               hda_nid_t nid, unsigned int chs)
 {
-        char name[32];
-        sprintf(name, "%s Playback Volume", pfx);
-        return add_control(spec, ALC_CTL_WIDGET_VOL, name,
+        return add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,
                            HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT));
 }
 
-static int alc662_add_sw_ctl(struct alc_spec *spec, const char *pfx,
+static inline int alc662_add_sw_ctl(struct alc_spec *spec, const char *pfx,
                              hda_nid_t nid, unsigned int chs)
 {
-        char name[32];
-        sprintf(name, "%s Playback Switch", pfx);
-        return add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+        return add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx,
                            HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_INPUT));
 }
 
@@ -17356,13 +18339,11 @@ static int alc662_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
                 return 0;
         nid = alc662_look_for_dac(codec, pin);
         if (!nid) {
-                char name[32];
                 /* the corresponding DAC is already occupied */
                 if (!(get_wcaps(codec, pin) & AC_WCAP_OUT_AMP))
                         return 0; /* no way */
                 /* create a switch only */
-                sprintf(name, "%s Playback Switch", pfx);
-                return add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+                return add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx,
                                    HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
         }
 
@@ -17500,15 +18481,23 @@ static int alc662_parse_auto_config(struct hda_codec *codec)
         spec->num_mux_defs = 1;
         spec->input_mux = &spec->private_imux[0];
 
-        add_verb(spec, alc662_auto_init_verbs);
-        if (codec->vendor_id == 0x10ec0663)
-                add_verb(spec, alc663_auto_init_verbs);
+        add_verb(spec, alc662_init_verbs);
+        if (codec->vendor_id == 0x10ec0272 || codec->vendor_id == 0x10ec0663 ||
+            codec->vendor_id == 0x10ec0665)
+                add_verb(spec, alc663_init_verbs);
+
+        if (codec->vendor_id == 0x10ec0272)
+                add_verb(spec, alc272_init_verbs);
 
         err = alc_auto_add_mic_boost(codec);
         if (err < 0)
                 return err;
 
-        alc_ssid_check(codec, 0x15, 0x1b, 0x14);
+        if (codec->vendor_id == 0x10ec0272 || codec->vendor_id == 0x10ec0663 ||
+            codec->vendor_id == 0x10ec0665 || codec->vendor_id == 0x10ec0670)
+            alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0x21);
+        else
+            alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);
 
         return 1;
 }
@@ -17538,6 +18527,15 @@ static int patch_alc662(struct hda_codec *codec)
 
         alc_fix_pll_init(codec, 0x20, 0x04, 15);
 
+        if (alc_read_coef_idx(codec, 0)==0x8020){
+                kfree(codec->chip_name);
+                codec->chip_name = kstrdup("ALC661", GFP_KERNEL);
+                if (!codec->chip_name) {
+                        alc_free(codec);
+                        return -ENOMEM;
+                }
+        }
+
         board_config = snd_hda_check_board_config(codec, ALC662_MODEL_LAST,
                                                   alc662_models,
                                                   alc662_cfg_tbl);
@@ -17585,11 +18583,20 @@ static int patch_alc662(struct hda_codec *codec)
 
         if (!spec->cap_mixer)
                 set_capture_mixer(codec);
-        if (codec->vendor_id == 0x10ec0662)
+
+        switch (codec->vendor_id) {
+        case 0x10ec0662:
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
-        else
+                break;
+        case 0x10ec0272:
+        case 0x10ec0663:
+        case 0x10ec0665:
                 set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
-
+                break;
+        case 0x10ec0273:
+                set_beep_amp(spec, 0x0b, 0x03, HDA_INPUT);
+                break;
+        }
         spec->vmaster_nid = 0x02;
 
         codec->patch_ops = alc_patch_ops;
@@ -17599,11 +18606,24 @@ static int patch_alc662(struct hda_codec *codec)
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc662_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
 }
 
+static int patch_alc888(struct hda_codec *codec)
+{
+        if ((alc_read_coef_idx(codec, 0) & 0x00f0)==0x0030){
+                kfree(codec->chip_name);
+                codec->chip_name = kstrdup("ALC888-VD", GFP_KERNEL);
+                if (!codec->chip_name) {
+                        alc_free(codec);
+                        return -ENOMEM;
+                }
+                return patch_alc662(codec);
+        }
+        return patch_alc882(codec);
+}
+
 /*
  * patch entries
  */
@@ -17613,7 +18633,9 @@ static struct hda_codec_preset snd_hda_preset_realtek[] = {
         { .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 },
         { .id = 0x10ec0268, .name = "ALC268", .patch = patch_alc268 },
         { .id = 0x10ec0269, .name = "ALC269", .patch = patch_alc269 },
+        { .id = 0x10ec0270, .name = "ALC270", .patch = patch_alc269 },
         { .id = 0x10ec0272, .name = "ALC272", .patch = patch_alc662 },
+        { .id = 0x10ec0275, .name = "ALC275", .patch = patch_alc269 },
         { .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660",
           .patch = patch_alc861 },
         { .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd },
@@ -17624,6 +18646,8 @@ static struct hda_codec_preset snd_hda_preset_realtek[] = {
         { .id = 0x10ec0662, .rev = 0x100101, .name = "ALC662 rev1",
           .patch = patch_alc662 },
         { .id = 0x10ec0663, .name = "ALC663", .patch = patch_alc662 },
+        { .id = 0x10ec0665, .name = "ALC665", .patch = patch_alc662 },
+        { .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 },
         { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 },
         { .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 },
         { .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc882 },
@@ -17635,8 +18659,9 @@ static struct hda_codec_preset snd_hda_preset_realtek[] = {
         { .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc882 },
         { .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200",
           .patch = patch_alc882 },
-        { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc882 },
+        { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc888 },
         { .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc882 },
+        { .id = 0x10ec0892, .name = "ALC892", .patch = patch_alc662 },
         {} /* terminator */
 };
 
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
index 43b436c5d01b..f419ee8d75f0 100644
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
@@ -122,6 +122,7 @@ static int si3054_switch_put(struct snd_kcontrol *kcontrol,
 #define SI3054_KCONTROL(kname,reg,mask) { \
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
         .name = kname, \
+        .subdevice = HDA_SUBDEV_NID_FLAG | reg, \
         .info = si3054_switch_info, \
         .get  = si3054_switch_get, \
         .put  = si3054_switch_put, \
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 86de305fc9f2..a0e06d82da1f 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -93,6 +93,7 @@ enum {
         STAC_92HD83XXX_REF,
         STAC_92HD83XXX_PWR_REF,
         STAC_DELL_S14,
+        STAC_92HD83XXX_HP,
         STAC_92HD83XXX_MODELS
 };
 
@@ -103,6 +104,7 @@ enum {
         STAC_DELL_M4_2,
         STAC_DELL_M4_3,
         STAC_HP_M4,
+        STAC_HP_DV4,
         STAC_HP_DV5,
         STAC_HP_HDX,
         STAC_HP_DV4_1222NR,
@@ -208,6 +210,7 @@ struct sigmatel_spec {
         unsigned int gpio_data;
         unsigned int gpio_mute;
         unsigned int gpio_led;
+        unsigned int gpio_led_polarity;
 
         /* stream */
         unsigned int stream_delay;
@@ -566,6 +569,11 @@ static hda_nid_t stac92hd83xxx_pin_nids[10] = {
         0x0f, 0x10, 0x11, 0x1f, 0x20,
 };
 
+static hda_nid_t stac92hd88xxx_pin_nids[10] = {
+        0x0a, 0x0b, 0x0c, 0x0d,
+        0x0f, 0x11, 0x1f, 0x20,
+};
+
 #define STAC92HD71BXX_NUM_PINS 13
 static hda_nid_t stac92hd71bxx_pin_nids_4port[STAC92HD71BXX_NUM_PINS] = {
         0x0a, 0x0b, 0x0c, 0x0d, 0x00,
@@ -1085,7 +1093,7 @@ static int stac92xx_build_controls(struct hda_codec *codec)
         if (!spec->auto_mic && spec->num_dmuxes > 0 &&
             snd_hda_get_bool_hint(codec, "separate_dmux") == 1) {
                 stac_dmux_mixer.count = spec->num_dmuxes;
-                err = snd_hda_ctl_add(codec,
+                err = snd_hda_ctl_add(codec, 0,
                                   snd_ctl_new1(&stac_dmux_mixer, codec));
                 if (err < 0)
                         return err;
@@ -1101,7 +1109,7 @@ static int stac92xx_build_controls(struct hda_codec *codec)
                         spec->spdif_mute = 1;
                 }
                 stac_smux_mixer.count = spec->num_smuxes;
-                err = snd_hda_ctl_add(codec,
+                err = snd_hda_ctl_add(codec, 0,
                                   snd_ctl_new1(&stac_smux_mixer, codec));
                 if (err < 0)
                         return err;
@@ -1537,6 +1545,11 @@ static unsigned int alienware_m17x_pin_configs[13] = {
         0x904601b0,
 };
 
+static unsigned int intel_dg45id_pin_configs[13] = {
+        0x02214230, 0x02A19240, 0x01013214, 0x01014210,
+        0x01A19250, 0x01011212, 0x01016211
+};
+
 static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
         [STAC_92HD73XX_REF]     = ref92hd73xx_pin_configs,
         [STAC_DELL_M6_AMIC]     = dell_m6_pin_configs,
@@ -1544,6 +1557,7 @@ static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
         [STAC_DELL_M6_BOTH]     = dell_m6_pin_configs,
         [STAC_DELL_EQ]  = dell_m6_pin_configs,
         [STAC_ALIENWARE_M17X]   = alienware_m17x_pin_configs,
+        [STAC_92HD73XX_INTEL]   = intel_dg45id_pin_configs,
 };
 
 static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
@@ -1592,6 +1606,10 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
                                 "Dell Studio 1555", STAC_DELL_M6_DMIC),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02bd,
                                 "Dell Studio 1557", STAC_DELL_M6_DMIC),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe,
+                                "Dell Studio XPS 1645", STAC_DELL_M6_BOTH),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0413,
+                                "Dell Studio 1558", STAC_DELL_M6_BOTH),
         {} /* terminator */
 };
 
@@ -1624,6 +1642,7 @@ static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
         [STAC_92HD83XXX_REF] = "ref",
         [STAC_92HD83XXX_PWR_REF] = "mic-ref",
         [STAC_DELL_S14] = "dell-s14",
+        [STAC_92HD83XXX_HP] = "hp",
 };
 
 static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
@@ -1634,6 +1653,8 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
                       "DFI LanParty", STAC_92HD83XXX_REF),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ba,
                       "unknown Dell", STAC_DELL_S14),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x3600,
+                      "HP", STAC_92HD83XXX_HP),
         {} /* terminator */
 };
 
@@ -1671,6 +1692,7 @@ static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
         [STAC_DELL_M4_2]        = dell_m4_2_pin_configs,
         [STAC_DELL_M4_3]        = dell_m4_3_pin_configs,
         [STAC_HP_M4]            = NULL,
+        [STAC_HP_DV4]           = NULL,
         [STAC_HP_DV5]           = NULL,
         [STAC_HP_HDX]           = NULL,
         [STAC_HP_DV4_1222NR]    = NULL,
@@ -1683,6 +1705,7 @@ static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {
         [STAC_DELL_M4_2] = "dell-m4-2",
         [STAC_DELL_M4_3] = "dell-m4-3",
         [STAC_HP_M4] = "hp-m4",
+        [STAC_HP_DV4] = "hp-dv4",
         [STAC_HP_DV5] = "hp-dv5",
         [STAC_HP_HDX] = "hp-hdx",
         [STAC_HP_DV4_1222NR] = "hp-dv4-1222nr",
@@ -1701,7 +1724,7 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080,
                       "HP", STAC_HP_DV5),
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0,
-                      "HP dv4-7", STAC_HP_DV5),
+                      "HP dv4-7", STAC_HP_DV4),
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600,
                       "HP dv4-7", STAC_HP_DV5),
         SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3610,
@@ -1712,6 +1735,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
                       "HP HDX", STAC_HP_HDX),  /* HDX16 */
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3620,
                       "HP dv6", STAC_HP_DV5),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3061,
+                      "HP dv6", STAC_HP_DV5), /* HP dv6-1110ax */
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010,
                       "HP", STAC_HP_DV5),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
@@ -2091,6 +2116,7 @@ static unsigned int ref9205_pin_configs[12] = {
     10280204
     1028021F
     10280228 (Dell Vostro 1500)
+    10280229 (Dell Vostro 1700)
 */
 static unsigned int dell_9205_m42_pin_configs[12] = {
         0x0321101F, 0x03A11020, 0x400003FA, 0x90170310,
@@ -2176,6 +2202,8 @@ static struct snd_pci_quirk stac9205_cfg_tbl[] = {
                       "Dell Inspiron", STAC_9205_DELL_M44),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0228,
                       "Dell Vostro 1500", STAC_9205_DELL_M42),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0229,
+                      "Dell Vostro 1700", STAC_9205_DELL_M42),
         /* Gateway */
         SND_PCI_QUIRK(0x107b, 0x0560, "Gateway T6834c", STAC_9205_EAPD),
         SND_PCI_QUIRK(0x107b, 0x0565, "Gateway T1616", STAC_9205_EAPD),
@@ -2648,6 +2676,7 @@ static int stac92xx_clfe_switch_put(struct snd_kcontrol *kcontrol,
 enum {
         STAC_CTL_WIDGET_VOL,
         STAC_CTL_WIDGET_MUTE,
+        STAC_CTL_WIDGET_MUTE_BEEP,
         STAC_CTL_WIDGET_MONO_MUX,
         STAC_CTL_WIDGET_HP_SWITCH,
         STAC_CTL_WIDGET_IO_SWITCH,
@@ -2658,6 +2687,7 @@ enum {
 static struct snd_kcontrol_new stac92xx_control_templates[] = {
         HDA_CODEC_VOLUME(NULL, 0, 0, 0),
         HDA_CODEC_MUTE(NULL, 0, 0, 0),
+        HDA_CODEC_MUTE_BEEP(NULL, 0, 0, 0),
         STAC_MONO_MUX,
         STAC_CODEC_HP_SWITCH(NULL),
         STAC_CODEC_IO_SWITCH(NULL, 0),
@@ -2669,7 +2699,8 @@ static struct snd_kcontrol_new stac92xx_control_templates[] = {
 static struct snd_kcontrol_new *
 stac_control_new(struct sigmatel_spec *spec,
                  struct snd_kcontrol_new *ktemp,
-                 const char *name)
+                 const char *name,
+                 unsigned int subdev)
 {
         struct snd_kcontrol_new *knew;
 
@@ -2685,6 +2716,7 @@ stac_control_new(struct sigmatel_spec *spec,
                 spec->kctls.alloced--;
                 return NULL;
         }
+        knew->subdevice = subdev;
         return knew;
 }
 
@@ -2693,7 +2725,8 @@ static int stac92xx_add_control_temp(struct sigmatel_spec *spec,
                                      int idx, const char *name,
                                      unsigned long val)
 {
-        struct snd_kcontrol_new *knew = stac_control_new(spec, ktemp, name);
+        struct snd_kcontrol_new *knew = stac_control_new(spec, ktemp, name,
+                                                         HDA_SUBDEV_AMP_FLAG);
         if (!knew)
                 return -ENOMEM;
         knew->index = idx;
@@ -2764,7 +2797,7 @@ static int stac92xx_add_input_source(struct sigmatel_spec *spec)
         if (!spec->num_adcs || imux->num_items <= 1)
                 return 0; /* no need for input source control */
         knew = stac_control_new(spec, &stac_input_src_temp,
-                                stac_input_src_temp.name);
+                                stac_input_src_temp.name, 0);
         if (!knew)
                 return -ENOMEM;
         knew->count = spec->num_adcs;
@@ -2852,6 +2885,13 @@ static hda_nid_t get_unassigned_dac(struct hda_codec *codec, hda_nid_t nid)
 
         conn_len = snd_hda_get_connections(codec, nid, conn,
                                            HDA_MAX_CONNECTIONS);
+        /* 92HD88: trace back up the link of nids to find the DAC */
+        while (conn_len == 1 && (get_wcaps_type(get_wcaps(codec, conn[0]))
+                                        != AC_WID_AUD_OUT)) {
+                nid = conn[0];
+                conn_len = snd_hda_get_connections(codec, nid, conn,
+                        HDA_MAX_CONNECTIONS);
+        }
         for (j = 0; j < conn_len; j++) {
                 wcaps = get_wcaps(codec, conn[j]);
                 wtype = get_wcaps_type(wcaps);
@@ -3221,12 +3261,15 @@ static int stac92xx_auto_create_beep_ctls(struct hda_codec *codec,
 {
         struct sigmatel_spec *spec = codec->spec;
         u32 caps = query_amp_caps(codec, nid, HDA_OUTPUT);
-        int err;
+        int err, type = STAC_CTL_WIDGET_MUTE_BEEP;
+
+        if (spec->anabeep_nid == nid)
+                type = STAC_CTL_WIDGET_MUTE;
 
         /* check for mute support for the the amp */
         if ((caps & AC_AMPCAP_MUTE) >> AC_AMPCAP_MUTE_SHIFT) {
-                err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE,
-                        "PC Beep Playback Switch",
+                err = stac92xx_add_control(spec, type,
+                        "Beep Playback Switch",
                         HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT));
                         if (err < 0)
                                 return err;
@@ -3235,7 +3278,7 @@ static int stac92xx_auto_create_beep_ctls(struct hda_codec *codec,
         /* 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,
-                        "PC Beep Playback Volume",
+                        "Beep Playback Volume",
                         HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT));
                         if (err < 0)
                                 return err;
@@ -3258,12 +3301,7 @@ static int stac92xx_dig_beep_switch_put(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        int enabled = !!ucontrol->value.integer.value[0];
-        if (codec->beep->enabled != enabled) {
-                codec->beep->enabled = enabled;
-                return 1;
-        }
-        return 0;
+        return snd_hda_enable_beep_device(codec, ucontrol->value.integer.value[0]);
 }
 
 static struct snd_kcontrol_new stac92xx_dig_beep_ctrl = {
@@ -3276,7 +3314,7 @@ static struct snd_kcontrol_new stac92xx_dig_beep_ctrl = {
 static int stac92xx_beep_switch_ctl(struct hda_codec *codec)
 {
         return stac92xx_add_control_temp(codec->spec, &stac92xx_dig_beep_ctrl,
-                                         0, "PC Beep Playback Switch", 0);
+                                         0, "Beep Playback Switch", 0);
 }
 #endif
 
@@ -3631,6 +3669,26 @@ static void stac92xx_auto_init_hp_out(struct hda_codec *codec)
         }
 }
 
+static int is_dual_headphones(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int i, valid_hps;
+
+        if (spec->autocfg.line_out_type != AUTO_PIN_SPEAKER_OUT ||
+            spec->autocfg.hp_outs <= 1)
+                return 0;
+        valid_hps = 0;
+        for (i = 0; i < spec->autocfg.hp_outs; i++) {
+                hda_nid_t nid = spec->autocfg.hp_pins[i];
+                unsigned int cfg = snd_hda_codec_get_pincfg(codec, nid);
+                if (get_defcfg_location(cfg) & AC_JACK_LOC_SEPARATE)
+                        continue;
+                valid_hps++;
+        }
+        return (valid_hps > 1);
+}
+
+
 static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out, hda_nid_t dig_in)
 {
         struct sigmatel_spec *spec = codec->spec;
@@ -3647,8 +3705,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
         /* 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) {
+        if (is_dual_headphones(codec)) {
                 /* Copy hp_outs to line_outs, backup line_outs in
                  * speaker_outs so that the following routines can handle
                  * HP pins as primary outputs.
@@ -3743,15 +3800,16 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
                 err = snd_hda_attach_beep_device(codec, nid);
                 if (err < 0)
                         return err;
-                /* IDT/STAC codecs have linear beep tone parameter */
-                codec->beep->linear_tone = 1;
-                /* if no beep switch is available, make its own one */
-                caps = query_amp_caps(codec, nid, HDA_OUTPUT);
-                if (codec->beep &&
-                    !((caps & AC_AMPCAP_MUTE) >> AC_AMPCAP_MUTE_SHIFT)) {
-                        err = stac92xx_beep_switch_ctl(codec);
-                        if (err < 0)
-                                return err;
+                if (codec->beep) {
+                        /* IDT/STAC codecs have linear beep tone parameter */
+                        codec->beep->linear_tone = 1;
+                        /* if no beep switch is available, make its own one */
+                        caps = query_amp_caps(codec, nid, HDA_OUTPUT);
+                        if (!(caps & AC_AMPCAP_MUTE)) {
+                                err = stac92xx_beep_switch_ctl(codec);
+                                if (err < 0)
+                                        return err;
+                        }
                 }
         }
 #endif
@@ -4120,34 +4178,52 @@ static void stac92xx_power_down(struct hda_codec *codec)
 static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid,
                                   int enable);
 
+static inline int get_int_hint(struct hda_codec *codec, const char *key,
+                               int *valp)
+{
+        const char *p;
+        p = snd_hda_get_hint(codec, key);
+        if (p) {
+                unsigned long val;
+                if (!strict_strtoul(p, 0, &val)) {
+                        *valp = val;
+                        return 1;
+                }
+        }
+        return 0;
+}
+
 /* override some hints from the hwdep entry */
 static void stac_store_hints(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
-        const char *p;
         int val;
 
         val = snd_hda_get_bool_hint(codec, "hp_detect");
         if (val >= 0)
                 spec->hp_detect = val;
-        p = snd_hda_get_hint(codec, "gpio_mask");
-        if (p) {
-                spec->gpio_mask = simple_strtoul(p, NULL, 0);
+        if (get_int_hint(codec, "gpio_mask", &spec->gpio_mask)) {
                 spec->eapd_mask = spec->gpio_dir = spec->gpio_data =
                         spec->gpio_mask;
         }
-        p = snd_hda_get_hint(codec, "gpio_dir");
-        if (p)
-                spec->gpio_dir = simple_strtoul(p, NULL, 0) & spec->gpio_mask;
-        p = snd_hda_get_hint(codec, "gpio_data");
-        if (p)
-                spec->gpio_data = simple_strtoul(p, NULL, 0) & spec->gpio_mask;
-        p = snd_hda_get_hint(codec, "eapd_mask");
-        if (p)
-                spec->eapd_mask = simple_strtoul(p, NULL, 0) & spec->gpio_mask;
+        if (get_int_hint(codec, "gpio_dir", &spec->gpio_dir))
+                spec->gpio_mask &= spec->gpio_mask;
+        if (get_int_hint(codec, "gpio_data", &spec->gpio_data))
+                spec->gpio_dir &= spec->gpio_mask;
+        if (get_int_hint(codec, "eapd_mask", &spec->eapd_mask))
+                spec->eapd_mask &= spec->gpio_mask;
+        if (get_int_hint(codec, "gpio_mute", &spec->gpio_mute))
+                spec->gpio_mute &= spec->gpio_mask;
         val = snd_hda_get_bool_hint(codec, "eapd_switch");
         if (val >= 0)
                 spec->eapd_switch = val;
+        get_int_hint(codec, "gpio_led_polarity", &spec->gpio_led_polarity);
+        if (get_int_hint(codec, "gpio_led", &spec->gpio_led)) {
+                spec->gpio_mask |= spec->gpio_led;
+                spec->gpio_dir |= spec->gpio_led;
+                if (spec->gpio_led_polarity)
+                        spec->gpio_data |= spec->gpio_led;
+        }
 }
 
 static int stac92xx_init(struct hda_codec *codec)
@@ -4294,6 +4370,12 @@ static int stac92xx_init(struct hda_codec *codec)
                 if (enable_pin_detect(codec, nid, STAC_PWR_EVENT))
                         stac_issue_unsol_event(codec, nid);
         }
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        /* sync mute LED */
+        if (spec->gpio_led && codec->patch_ops.check_power_status)
+                codec->patch_ops.check_power_status(codec, 0x01);
+#endif  
         if (spec->dac_list)
                 stac92xx_power_down(codec);
         return 0;
@@ -4329,6 +4411,18 @@ static void stac92xx_free_kctls(struct hda_codec *codec)
         snd_array_free(&spec->kctls);
 }
 
+static void stac92xx_shutup(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+
+        snd_hda_shutup_pins(codec);
+
+        if (spec->eapd_mask)
+                stac_gpio_set(codec, spec->gpio_mask,
+                                spec->gpio_dir, spec->gpio_data &
+                                ~spec->eapd_mask);
+}
+
 static void stac92xx_free(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
@@ -4336,6 +4430,7 @@ static void stac92xx_free(struct hda_codec *codec)
         if (! spec)
                 return;
 
+        stac92xx_shutup(codec);
         stac92xx_free_jacks(codec);
         snd_array_free(&spec->events);
 
@@ -4386,14 +4481,11 @@ static void stac92xx_reset_pinctl(struct hda_codec *codec, hda_nid_t nid,
                                           pin_ctl & ~flag);
 }
 
-static int get_pin_presence(struct hda_codec *codec, hda_nid_t nid)
+static inline int get_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;
-        return 0;
+        return snd_hda_jack_detect(codec, nid);
 }
 
 static void stac92xx_line_out_detect(struct hda_codec *codec,
@@ -4670,13 +4762,86 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
         }
 }
 
-static int hp_bseries_system(u32 subsystem_id)
+static int hp_blike_system(u32 subsystem_id);
+
+static void set_hp_led_gpio(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        unsigned int gpio;
+
+        if (spec->gpio_led)
+                return;
+
+        gpio = snd_hda_param_read(codec, codec->afg, AC_PAR_GPIO_CAP);
+        gpio &= AC_GPIO_IO_COUNT;
+        if (gpio > 3)
+                spec->gpio_led = 0x08; /* GPIO 3 */
+        else
+                spec->gpio_led = 0x01; /* GPIO 0 */
+}
+
+/*
+ * This method searches for the mute LED GPIO configuration
+ * provided as OEM string in SMBIOS. The format of that string
+ * is HP_Mute_LED_P_G or HP_Mute_LED_P
+ * where P can be 0 or 1 and defines mute LED GPIO control state (low/high)
+ * that corresponds to the NOT muted state of the master volume
+ * and G is the index of the GPIO to use as the mute LED control (0..9)
+ * If _G portion is missing it is assigned based on the codec ID
+ *
+ * So, HP B-series like systems may have HP_Mute_LED_0 (current models)
+ * or  HP_Mute_LED_0_3 (future models) OEM SMBIOS strings
+ *
+ *
+ * The dv-series laptops don't seem to have the HP_Mute_LED* strings in
+ * SMBIOS - at least the ones I have seen do not have them - which include
+ * my own system (HP Pavilion dv6-1110ax) and my cousin's
+ * HP Pavilion dv9500t CTO.
+ * Need more information on whether it is true across the entire series.
+ * -- kunal
+ */
+static int find_mute_led_gpio(struct hda_codec *codec, int default_polarity)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        const struct dmi_device *dev = NULL;
+
+        if ((codec->subsystem_id >> 16) == PCI_VENDOR_ID_HP) {
+                while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING,
+                                                                NULL, dev))) {
+                        if (sscanf(dev->name, "HP_Mute_LED_%d_%d",
+                                  &spec->gpio_led_polarity,
+                                  &spec->gpio_led) == 2) {
+                                spec->gpio_led = 1 << spec->gpio_led;
+                                return 1;
+                        }
+                        if (sscanf(dev->name, "HP_Mute_LED_%d",
+                                  &spec->gpio_led_polarity) == 1) {
+                                set_hp_led_gpio(codec);
+                                return 1;
+                        }
+                }
+
+                /*
+                 * Fallback case - if we don't find the DMI strings,
+                 * we statically set the GPIO - if not a B-series system.
+                 */
+                if (!hp_blike_system(codec->subsystem_id)) {
+                        set_hp_led_gpio(codec);
+                        spec->gpio_led_polarity = default_polarity;
+                        return 1;
+                }
+        }
+        return 0;
+}
+
+static int hp_blike_system(u32 subsystem_id)
 {
         switch (subsystem_id) {
-        case 0x103c307e:
-        case 0x103c307f:
-        case 0x103c3080:
-        case 0x103c3081:
+        case 0x103c1520:
+        case 0x103c1521:
+        case 0x103c1523:
+        case 0x103c1524:
+        case 0x103c1525:
         case 0x103c1722:
         case 0x103c1723:
         case 0x103c1724:
@@ -4685,6 +4850,14 @@ static int hp_bseries_system(u32 subsystem_id)
         case 0x103c1727:
         case 0x103c1728:
         case 0x103c1729:
+        case 0x103c172a:
+        case 0x103c172b:
+        case 0x103c307e:
+        case 0x103c307f:
+        case 0x103c3080:
+        case 0x103c3081:
+        case 0x103c7007:
+        case 0x103c7008:
                 return 1;
         }
         return 0;
@@ -4752,6 +4925,11 @@ static int stac92xx_resume(struct hda_codec *codec)
                         stac_issue_unsol_event(codec,
                                                spec->autocfg.line_out_pins[0]);
         }
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        /* sync mute LED */
+        if (spec->gpio_led && codec->patch_ops.check_power_status)
+                codec->patch_ops.check_power_status(codec, 0x01);
+#endif  
         return 0;
 }
 
@@ -4771,48 +4949,34 @@ static int stac92xx_hp_check_power_status(struct hda_codec *codec,
                                               hda_nid_t nid)
 {
         struct sigmatel_spec *spec = codec->spec;
+        int i, muted = 1;
 
-        if (nid == 0x10) {
-                if (snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) &
-                    HDA_AMP_MUTE)
-                        spec->gpio_data &= ~spec->gpio_led; /* orange */
-                else
-                        spec->gpio_data |= spec->gpio_led; /* white */
-
-                if (hp_bseries_system(codec->subsystem_id)) {
-                        /* LED state is inverted on these systems */
-                        spec->gpio_data ^= spec->gpio_led;
+        for (i = 0; i < spec->multiout.num_dacs; i++) {
+                nid = spec->multiout.dac_nids[i];
+                if (!(snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) &
+                      HDA_AMP_MUTE)) {
+                        muted = 0; /* something heard */
+                        break;
                 }
+        }
+        if (muted)
+                spec->gpio_data &= ~spec->gpio_led; /* orange */
+        else
+                spec->gpio_data |= spec->gpio_led; /* white */
 
-                stac_gpio_set(codec, spec->gpio_mask,
-                              spec->gpio_dir,
-                              spec->gpio_data);
+        if (!spec->gpio_led_polarity) {
+                /* LED state is inverted on these systems */
+                spec->gpio_data ^= spec->gpio_led;
         }
 
+        stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, spec->gpio_data);
         return 0;
 }
 #endif
 
 static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state)
 {
-        struct sigmatel_spec *spec = codec->spec;
-        int i;
-        hda_nid_t nid;
-
-        /* reset each pin before powering down DAC/ADC to avoid click noise */
-        nid = codec->start_nid;
-        for (i = 0; i < codec->num_nodes; i++, nid++) {
-                unsigned int wcaps = get_wcaps(codec, nid);
-                unsigned int wid_type = get_wcaps_type(wcaps);
-                if (wid_type == AC_WID_PIN)
-                        snd_hda_codec_read(codec, nid, 0,
-                                AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
-        }
-
-        if (spec->eapd_mask)
-                stac_gpio_set(codec, spec->gpio_mask,
-                                spec->gpio_dir, spec->gpio_data &
-                                ~spec->eapd_mask);
+        stac92xx_shutup(codec);
         return 0;
 }
 #endif
@@ -4827,6 +4991,7 @@ static struct hda_codec_ops stac92xx_patch_ops = {
         .suspend = stac92xx_suspend,
         .resume = stac92xx_resume,
 #endif
+        .reboot_notify = stac92xx_shutup,
 };
 
 static int patch_stac9200(struct hda_codec *codec)
@@ -4838,6 +5003,7 @@ static int patch_stac9200(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
+        codec->no_trigger_sense = 1;
         codec->spec = spec;
         spec->num_pins = ARRAY_SIZE(stac9200_pin_nids);
         spec->pin_nids = stac9200_pin_nids;
@@ -4900,6 +5066,7 @@ static int patch_stac925x(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
+        codec->no_trigger_sense = 1;
         codec->spec = spec;
         spec->num_pins = ARRAY_SIZE(stac925x_pin_nids);
         spec->pin_nids = stac925x_pin_nids;
@@ -4984,6 +5151,7 @@ static int patch_stac92hd73xx(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
+        codec->no_trigger_sense = 1;
         codec->spec = spec;
         codec->slave_dig_outs = stac92hd73xx_slave_dig_outs;
         spec->num_pins = ARRAY_SIZE(stac92hd73xx_pin_nids);
@@ -5125,12 +5293,12 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
         hda_nid_t conn[STAC92HD83_DAC_COUNT + 1];
         int err;
         int num_dacs;
-        hda_nid_t nid;
 
         spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
 
+        codec->no_trigger_sense = 1;
         codec->spec = spec;
         codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs;
         spec->digbeep_nid = 0x21;
@@ -5163,7 +5331,18 @@ again:
                                 stac92hd83xxx_brd_tbl[spec->board_config]);
 
         switch (codec->vendor_id) {
+        case 0x111d7666:
+        case 0x111d7667:
+        case 0x111d7668:
+        case 0x111d7669:
+                spec->num_pins = ARRAY_SIZE(stac92hd88xxx_pin_nids);
+                spec->pin_nids = stac92hd88xxx_pin_nids;
+                spec->mono_nid = 0;
+                spec->digbeep_nid = 0;
+                spec->num_pwrs = 0;
+                break;
         case 0x111d7604:
+        case 0x111d76d4:
         case 0x111d7605:
         case 0x111d76d5:
                 if (spec->board_config == STAC_92HD83XXX_PWR_REF)
@@ -5172,6 +5351,24 @@ again:
                 break;
         }
 
+        codec->patch_ops = stac92xx_patch_ops;
+
+        if (find_mute_led_gpio(codec, 0))
+                snd_printd("mute LED gpio %d polarity %d\n",
+                                spec->gpio_led,
+                                spec->gpio_led_polarity);
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (spec->gpio_led) {
+                spec->gpio_mask |= spec->gpio_led;
+                spec->gpio_dir |= spec->gpio_led;
+                spec->gpio_data |= spec->gpio_led;
+                /* register check_power_status callback. */
+                codec->patch_ops.check_power_status =
+                        stac92xx_hp_check_power_status;
+        }
+#endif  
+
         err = stac92xx_parse_auto_config(codec, 0x1d, 0);
         if (!err) {
                 if (spec->board_config < 0) {
@@ -5188,26 +5385,21 @@ again:
                 return err;
         }
 
-        switch (spec->board_config) {
-        case STAC_DELL_S14:
-                nid = 0xf;
-                break;
-        default:
-                nid = 0xe;
-                break;
-        }
-
-        num_dacs = snd_hda_get_connections(codec, nid,
+        /* docking output support */
+        num_dacs = snd_hda_get_connections(codec, 0xF,
                                 conn, STAC92HD83_DAC_COUNT + 1) - 1;
-        if (num_dacs < 0)
-                num_dacs = STAC92HD83_DAC_COUNT;
-
-        /* set port X to select the last DAC
-         */
-        snd_hda_codec_write_cache(codec, nid, 0,
+        /* skip non-DAC connections */
+        while (num_dacs >= 0 &&
+                        (get_wcaps_type(get_wcaps(codec, conn[num_dacs]))
+                                        != AC_WID_AUD_OUT))
+                num_dacs--;
+        /* set port E and F to select the last DAC */
+        if (num_dacs >= 0) {
+                snd_hda_codec_write_cache(codec, 0xE, 0,
                         AC_VERB_SET_CONNECT_SEL, num_dacs);
-
-        codec->patch_ops = stac92xx_patch_ops;
+                snd_hda_codec_write_cache(codec, 0xF, 0,
+                        AC_VERB_SET_CONNECT_SEL, num_dacs);
+        }
 
         codec->proc_widget_hook = stac92hd_proc_hook;
 
@@ -5269,6 +5461,54 @@ static int stac92hd71bxx_connected_smuxes(struct hda_codec *codec,
                 return 0;
 }
 
+/* HP dv7 bass switch - GPIO5 */
+#define stac_hp_bass_gpio_info  snd_ctl_boolean_mono_info
+static int stac_hp_bass_gpio_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->gpio_data & 0x20);
+        return 0;
+}
+
+static int stac_hp_bass_gpio_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 gpio_data;
+
+        gpio_data = (spec->gpio_data & ~0x20) |
+                (ucontrol->value.integer.value[0] ? 0x20 : 0);
+        if (gpio_data == spec->gpio_data)
+                return 0;
+        spec->gpio_data = gpio_data;
+        stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, spec->gpio_data);
+        return 1;
+}
+
+static struct snd_kcontrol_new stac_hp_bass_sw_ctrl = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .info = stac_hp_bass_gpio_info,
+        .get = stac_hp_bass_gpio_get,
+        .put = stac_hp_bass_gpio_put,
+};
+
+static int stac_add_hp_bass_switch(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+
+        if (!stac_control_new(spec, &stac_hp_bass_sw_ctrl,
+                              "Bass Speaker Playback Switch", 0))
+                return -ENOMEM;
+
+        spec->gpio_mask |= 0x20;
+        spec->gpio_dir |= 0x20;
+        spec->gpio_data |= 0x20;
+        return 0;
+}
+
 static int patch_stac92hd71bxx(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec;
@@ -5280,6 +5520,7 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
+        codec->no_trigger_sense = 1;
         codec->spec = spec;
         codec->patch_ops = stac92xx_patch_ops;
         spec->num_pins = STAC92HD71BXX_NUM_PINS;
@@ -5412,6 +5653,8 @@ again:
         spec->num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids);
         spec->num_smuxes = stac92hd71bxx_connected_smuxes(codec, 0x1e);
 
+        snd_printdd("Found board config: %d\n", spec->board_config);
+
         switch (spec->board_config) {
         case STAC_HP_M4:
                 /* enable internal microphone */
@@ -5437,6 +5680,8 @@ again:
                  */
                 spec->num_smuxes = 1;
                 spec->num_dmuxes = 1;
+                /* fallthrough */
+        case STAC_HP_DV4:
                 spec->gpio_led = 0x01;
                 /* fallthrough */
         case STAC_HP_DV5:
@@ -5452,12 +5697,11 @@ again:
                 spec->num_dmics = 1;
                 spec->num_dmuxes = 1;
                 spec->num_smuxes = 1;
-                /* orange/white mute led on GPIO3, orange=0, white=1 */
                 spec->gpio_led = 0x08;
                 break;
         }
 
-        if (hp_bseries_system(codec->subsystem_id)) {
+        if (hp_blike_system(codec->subsystem_id)) {
                 pin_cfg = snd_hda_codec_get_pincfg(codec, 0x0f);
                 if (get_defcfg_device(pin_cfg) == AC_JACK_LINE_OUT ||
                         get_defcfg_device(pin_cfg) == AC_JACK_SPEAKER  ||
@@ -5475,26 +5719,10 @@ again:
                 }
         }
 
-        if ((codec->subsystem_id >> 16) == PCI_VENDOR_ID_HP) {
-                const struct dmi_device *dev = NULL;
-                while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING,
-                                              NULL, dev))) {
-                        if (strcmp(dev->name, "HP_Mute_LED_1")) {
-                                switch (codec->vendor_id) {
-                                case 0x111d7608:
-                                        spec->gpio_led = 0x01;
-                                        break;
-                                case 0x111d7600:
-                                case 0x111d7601:
-                                case 0x111d7602:
-                                case 0x111d7603:
-                                        spec->gpio_led = 0x08;
-                                        break;
-                                }
-                                break;
-                        }
-                }
-        }
+        if (find_mute_led_gpio(codec, 1))
+                snd_printd("mute LED gpio %d polarity %d\n",
+                                spec->gpio_led,
+                                spec->gpio_led_polarity);
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (spec->gpio_led) {
@@ -5525,6 +5753,16 @@ again:
                 return err;
         }
 
+        /* enable bass on HP dv7 */
+        if (spec->board_config == STAC_HP_DV4 ||
+            spec->board_config == STAC_HP_DV5) {
+                unsigned int cap;
+                cap = snd_hda_param_read(codec, 0x1, AC_PAR_GPIO_CAP);
+                cap &= AC_GPIO_IO_COUNT;
+                if (cap >= 6)
+                        stac_add_hp_bass_switch(codec);
+        }
+
         codec->proc_widget_hook = stac92hd7x_proc_hook;
 
         return 0;
@@ -5539,6 +5777,7 @@ static int patch_stac922x(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
+        codec->no_trigger_sense = 1;
         codec->spec = spec;
         spec->num_pins = ARRAY_SIZE(stac922x_pin_nids);
         spec->pin_nids = stac922x_pin_nids;
@@ -5642,6 +5881,7 @@ static int patch_stac927x(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
+        codec->no_trigger_sense = 1;
         codec->spec = spec;
         codec->slave_dig_outs = stac927x_slave_dig_outs;
         spec->num_pins = ARRAY_SIZE(stac927x_pin_nids);
@@ -5776,6 +6016,7 @@ static int patch_stac9205(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
+        codec->no_trigger_sense = 1;
         codec->spec = spec;
         spec->num_pins = ARRAY_SIZE(stac9205_pin_nids);
         spec->pin_nids = stac9205_pin_nids;
@@ -5931,6 +6172,7 @@ static int patch_stac9872(struct hda_codec *codec)
         spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
+        codec->no_trigger_sense = 1;
         codec->spec = spec;
         spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
         spec->pin_nids = stac9872_pin_nids;
@@ -6019,8 +6261,13 @@ static struct hda_codec_preset snd_hda_preset_sigmatel[] = {
         { .id = 0x838476a7, .name = "STAC9254D", .patch = patch_stac9205 },
         { .id = 0x111d7603, .name = "92HD75B3X5", .patch = patch_stac92hd71bxx},
         { .id = 0x111d7604, .name = "92HD83C1X5", .patch = patch_stac92hd83xxx},
+        { .id = 0x111d76d4, .name = "92HD83C1C5", .patch = patch_stac92hd83xxx},
         { .id = 0x111d7605, .name = "92HD81B1X5", .patch = patch_stac92hd83xxx},
         { .id = 0x111d76d5, .name = "92HD81B1C5", .patch = patch_stac92hd83xxx},
+        { .id = 0x111d7666, .name = "92HD88B3", .patch = patch_stac92hd83xxx},
+        { .id = 0x111d7667, .name = "92HD88B1", .patch = patch_stac92hd83xxx},
+        { .id = 0x111d7668, .name = "92HD88B2", .patch = patch_stac92hd83xxx},
+        { .id = 0x111d7669, .name = "92HD88B4", .patch = patch_stac92hd83xxx},
         { .id = 0x111d7608, .name = "92HD75B2X5", .patch = patch_stac92hd71bxx},
         { .id = 0x111d7674, .name = "92HD73D1X5", .patch = patch_stac92hd73xx },
         { .id = 0x111d7675, .name = "92HD73C1X5", .patch = patch_stac92hd73xx },
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index ee89db90c9b6..73453814e098 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1,10 +1,10 @@
 /*
  * Universal Interface for Intel High Definition Audio Codec
  *
- * HD audio interface patch for VIA VT1702/VT1708/VT1709 codec
+ * HD audio interface patch for VIA VT17xx/VT18xx/VT20xx codec
  *
- * Copyright (c) 2006-2008 Lydia Wang <lydiawang@viatech.com>
- *                         Takashi Iwai <tiwai@suse.de>
+ *  (C) 2006-2009 VIA Technology, Inc.
+ *  (C) 2006-2008 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
@@ -22,21 +22,27 @@
  */
 
 /* * * * * * * * * * * * * * Release History * * * * * * * * * * * * * * * * */
-/*                                                                           */
+/*                                                                           */
 /* 2006-03-03  Lydia Wang  Create the basic patch to support VT1708 codec    */
-/* 2006-03-14  Lydia Wang  Modify hard code for some pin widget nid          */
-/* 2006-08-02  Lydia Wang  Add support to VT1709 codec                       */
+/* 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                        */
+/* 2007-09-12  Lydia Wang  Add EAPD enable during driver initialization      */
+/* 2007-09-17  Lydia Wang  Add VT1708B codec support                        */
 /* 2007-11-14  Lydia Wang  Add VT1708A codec HP and CD pin connect config    */
 /* 2008-02-03  Lydia Wang  Fix Rear channels and Back channels inverse issue */
-/* 2008-03-06  Lydia Wang  Add VT1702 codec and VT1708S codec support        */
-/* 2008-04-09  Lydia Wang  Add mute front speaker when HP plugin             */
-/* 2008-04-09  Lydia Wang  Add Independent HP feature                        */
+/* 2008-03-06  Lydia Wang  Add VT1702 codec and VT1708S codec support        */
+/* 2008-04-09  Lydia Wang  Add mute front speaker when HP plugin             */
+/* 2008-04-09  Lydia Wang  Add Independent HP feature                        */
 /* 2008-05-28  Lydia Wang  Add second S/PDIF Out support for VT1702          */
-/* 2008-09-15  Logan Li    Add VT1708S Mic Boost workaround/backdoor         */
-/*                                                                           */
+/* 2008-09-15  Logan Li    Add VT1708S Mic Boost workaround/backdoor         */
+/* 2009-02-16  Logan Li    Add support for VT1718S                           */
+/* 2009-03-13  Logan Li    Add support for VT1716S                           */
+/* 2009-04-14  Lydai Wang  Add support for VT1828S and VT2020                */
+/* 2009-07-08  Lydia Wang  Add support for VT2002P                           */
+/* 2009-07-21  Lydia Wang  Add support for VT1812                            */
+/* 2009-09-19  Lydia Wang  Add support for VT1818S                           */
+/*                                                                           */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 
@@ -48,6 +54,8 @@
 #include "hda_codec.h"
 #include "hda_local.h"
 
+#define NID_MAPPING             (-1)
+
 /* amp values */
 #define AMP_VAL_IDX_SHIFT       19
 #define AMP_VAL_IDX_MASK        (0x0f<<19)
@@ -76,14 +84,6 @@
 #define VT1702_HP_NID           0x17
 #define VT1702_DIGOUT_NID       0x11
 
-#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)
-#define IS_VT1708S_VENDORID(x)          ((x) >= 0x11060397 && (x) <= 0x11067397)
-#define IS_VT1702_VENDORID(x)           ((x) >= 0x11060398 && (x) <= 0x11067398)
-
 enum VIA_HDA_CODEC {
         UNKNOWN = -1,
         VT1708,
@@ -92,12 +92,89 @@ enum VIA_HDA_CODEC {
         VT1708B_8CH,
         VT1708B_4CH,
         VT1708S,
+        VT1708BCE,
         VT1702,
+        VT1718S,
+        VT1716S,
+        VT2002P,
+        VT1812,
         CODEC_TYPES,
 };
 
-static enum VIA_HDA_CODEC get_codec_type(u32 vendor_id)
+struct via_spec {
+        /* codec parameterization */
+        struct snd_kcontrol_new *mixers[6];
+        unsigned int num_mixers;
+
+        struct hda_verb *init_verbs[5];
+        unsigned int num_iverbs;
+
+        char *stream_name_analog;
+        struct hda_pcm_stream *stream_analog_playback;
+        struct hda_pcm_stream *stream_analog_capture;
+
+        char *stream_name_digital;
+        struct hda_pcm_stream *stream_digital_playback;
+        struct hda_pcm_stream *stream_digital_capture;
+
+        /* playback */
+        struct hda_multi_out multiout;
+        hda_nid_t slave_dig_outs[2];
+
+        /* capture */
+        unsigned int num_adc_nids;
+        hda_nid_t *adc_nids;
+        hda_nid_t mux_nids[3];
+        hda_nid_t dig_in_nid;
+        hda_nid_t dig_in_pin;
+
+        /* capture source */
+        const struct hda_input_mux *input_mux;
+        unsigned int cur_mux[3];
+
+        /* PCM information */
+        struct hda_pcm pcm_rec[3];
+
+        /* dynamic controls, init_verbs and input_mux */
+        struct auto_pin_cfg autocfg;
+        struct snd_array kctls;
+        struct hda_input_mux private_imux[2];
+        hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
+
+        /* HP mode source */
+        const struct hda_input_mux *hp_mux;
+        unsigned int hp_independent_mode;
+        unsigned int hp_independent_mode_index;
+        unsigned int smart51_enabled;
+        unsigned int dmic_enabled;
+        enum VIA_HDA_CODEC codec_type;
+
+        /* work to check hp jack state */
+        struct hda_codec *codec;
+        struct delayed_work vt1708_hp_work;
+        int vt1708_jack_detectect;
+        int vt1708_hp_present;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        struct hda_loopback_check loopback;
+#endif
+};
+
+static struct via_spec * via_new_spec(struct hda_codec *codec)
 {
+        struct via_spec *spec;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return NULL;
+
+        codec->spec = spec;
+        spec->codec = codec;
+        return spec;
+}
+
+static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec)
+{
+        u32 vendor_id = codec->vendor_id;
         u16 ven_id = vendor_id >> 16;
         u16 dev_id = vendor_id & 0xffff;
         enum VIA_HDA_CODEC codec_type;
@@ -111,9 +188,11 @@ static enum VIA_HDA_CODEC get_codec_type(u32 vendor_id)
                 codec_type = VT1709_10CH;
         else if (dev_id >= 0xe714 && dev_id <= 0xe717)
                 codec_type = VT1709_6CH;
-        else if (dev_id >= 0xe720 && dev_id <= 0xe723)
+        else if (dev_id >= 0xe720 && dev_id <= 0xe723) {
                 codec_type = VT1708B_8CH;
-        else if (dev_id >= 0xe724 && dev_id <= 0xe727)
+                if (snd_hda_param_read(codec, 0x16, AC_PAR_CONNLIST_LEN) == 0x7)
+                        codec_type = VT1708BCE;
+        } else if (dev_id >= 0xe724 && dev_id <= 0xe727)
                 codec_type = VT1708B_4CH;
         else if ((dev_id & 0xfff) == 0x397
                  && (dev_id >> 12) < 8)
@@ -121,6 +200,19 @@ static enum VIA_HDA_CODEC get_codec_type(u32 vendor_id)
         else if ((dev_id & 0xfff) == 0x398
                  && (dev_id >> 12) < 8)
                 codec_type = VT1702;
+        else if ((dev_id & 0xfff) == 0x428
+                 && (dev_id >> 12) < 8)
+                codec_type = VT1718S;
+        else if (dev_id == 0x0433 || dev_id == 0xa721)
+                codec_type = VT1716S;
+        else if (dev_id == 0x0441 || dev_id == 0x4441)
+                codec_type = VT1718S;
+        else if (dev_id == 0x0438 || dev_id == 0x4438)
+                codec_type = VT2002P;
+        else if (dev_id == 0x0448)
+                codec_type = VT1812;
+        else if (dev_id == 0x0440)
+                codec_type = VT1708S;
         else
                 codec_type = UNKNOWN;
         return codec_type;
@@ -128,10 +220,16 @@ static enum VIA_HDA_CODEC get_codec_type(u32 vendor_id)
 
 #define VIA_HP_EVENT            0x01
 #define VIA_GPIO_EVENT          0x02
+#define VIA_JACK_EVENT          0x04
+#define VIA_MONO_EVENT          0x08
+#define VIA_SPEAKER_EVENT       0x10
+#define VIA_BIND_HP_EVENT       0x20
 
 enum {
         VIA_CTL_WIDGET_VOL,
         VIA_CTL_WIDGET_MUTE,
+        VIA_CTL_WIDGET_ANALOG_MUTE,
+        VIA_CTL_WIDGET_BIND_PIN_MUTE,
 };
 
 enum {
@@ -141,99 +239,162 @@ enum {
         AUTO_SEQ_SIDE
 };
 
-/* Some VT1708S based boards gets the micboost setting wrong, so we have
- * to apply some brute-force and re-write the TLV's by software. */
-static int mic_boost_tlv(struct snd_kcontrol *kcontrol, int op_flag,
-                         unsigned int size, unsigned int __user *_tlv)
+static void analog_low_current_mode(struct hda_codec *codec, int stream_idle);
+static void set_jack_power_state(struct hda_codec *codec);
+static int is_aa_path_mute(struct hda_codec *codec);
+
+static void vt1708_start_hp_work(struct via_spec *spec)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = get_amp_nid(kcontrol);
+        if (spec->codec_type != VT1708 || spec->autocfg.hp_pins[0] == 0)
+                return;
+        snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81,
+                            !spec->vt1708_jack_detectect);
+        if (!delayed_work_pending(&spec->vt1708_hp_work))
+                schedule_delayed_work(&spec->vt1708_hp_work,
+                                      msecs_to_jiffies(100));
+}
 
-        if (get_codec_type(codec->vendor_id) == VT1708S
-            && (nid == 0x1a || nid == 0x1e)) {
-                if (size < 4 * sizeof(unsigned int))
-                        return -ENOMEM;
-                if (put_user(1, _tlv))  /* SNDRV_CTL_TLVT_DB_SCALE */
-                        return -EFAULT;
-                if (put_user(2 * sizeof(unsigned int), _tlv + 1))
-                        return -EFAULT;
-                if (put_user(0, _tlv + 2)) /* offset = 0 */
-                        return -EFAULT;
-                if (put_user(1000, _tlv + 3)) /* step size = 10 dB */
-                        return -EFAULT;
-        }
-        return 0;
+static void vt1708_stop_hp_work(struct via_spec *spec)
+{
+        if (spec->codec_type != VT1708 || spec->autocfg.hp_pins[0] == 0)
+                return;
+        if (snd_hda_get_bool_hint(spec->codec, "analog_loopback_hp_detect") == 1
+            && !is_aa_path_mute(spec->codec))
+                return;
+        snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81,
+                            !spec->vt1708_jack_detectect);
+        cancel_delayed_work(&spec->vt1708_hp_work);
+        flush_scheduled_work();
 }
 
-static int mic_boost_volume_info(struct snd_kcontrol *kcontrol,
-                                 struct snd_ctl_elem_info *uinfo)
+
+static int analog_input_switch_put(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_value *ucontrol)
 {
+        int change = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = get_amp_nid(kcontrol);
 
-        if (get_codec_type(codec->vendor_id) == VT1708S
-            && (nid == 0x1a || nid == 0x1e)) {
-                uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-                uinfo->count = 2;
-                uinfo->value.integer.min = 0;
-                uinfo->value.integer.max = 3;
+        set_jack_power_state(codec);
+        analog_low_current_mode(snd_kcontrol_chip(kcontrol), -1);
+        if (snd_hda_get_bool_hint(codec, "analog_loopback_hp_detect") == 1) {
+                if (is_aa_path_mute(codec))
+                        vt1708_start_hp_work(codec->spec);
+                else
+                        vt1708_stop_hp_work(codec->spec);
         }
-        return 0;
+        return change;
 }
 
-static struct snd_kcontrol_new vt1708_control_templates[] = {
-        HDA_CODEC_VOLUME(NULL, 0, 0, 0),
-        HDA_CODEC_MUTE(NULL, 0, 0, 0),
-};
+/* modify .put = snd_hda_mixer_amp_switch_put */
+#define ANALOG_INPUT_MUTE                                               \
+        {               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,            \
+                        .name = NULL,                                   \
+                        .index = 0,                                     \
+                        .info = snd_hda_mixer_amp_switch_info,          \
+                        .get = snd_hda_mixer_amp_switch_get,            \
+                        .put = analog_input_switch_put,                 \
+                        .private_value = HDA_COMPOSE_AMP_VAL(0, 3, 0, 0) }
 
+static void via_hp_bind_automute(struct hda_codec *codec);
 
-struct via_spec {
-        /* codec parameterization */
-        struct snd_kcontrol_new *mixers[3];
-        unsigned int num_mixers;
-
-        struct hda_verb *init_verbs[5];
-        unsigned int num_iverbs;
-
-        char *stream_name_analog;
-        struct hda_pcm_stream *stream_analog_playback;
-        struct hda_pcm_stream *stream_analog_capture;
-
-        char *stream_name_digital;
-        struct hda_pcm_stream *stream_digital_playback;
-        struct hda_pcm_stream *stream_digital_capture;
-
-        /* playback */
-        struct hda_multi_out multiout;
-        hda_nid_t slave_dig_outs[2];
-
-        /* capture */
-        unsigned int num_adc_nids;
-        hda_nid_t *adc_nids;
-        hda_nid_t mux_nids[3];
-        hda_nid_t dig_in_nid;
-        hda_nid_t dig_in_pin;
+static int bind_pin_switch_put(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct via_spec *spec = codec->spec;
+        int i;
+        int change = 0;
 
-        /* capture source */
-        const struct hda_input_mux *input_mux;
-        unsigned int cur_mux[3];
+        long *valp = ucontrol->value.integer.value;
+        int lmute, rmute;
+        if (strstr(kcontrol->id.name, "Switch") == NULL) {
+                snd_printd("Invalid control!\n");
+                return change;
+        }
+        change = snd_hda_mixer_amp_switch_put(kcontrol,
+                                              ucontrol);
+        /* Get mute value */
+        lmute = *valp ? 0 : HDA_AMP_MUTE;
+        valp++;
+        rmute = *valp ? 0 : HDA_AMP_MUTE;
+
+        /* Set hp pins */
+        if (!spec->hp_independent_mode) {
+                for (i = 0; i < spec->autocfg.hp_outs; i++) {
+                        snd_hda_codec_amp_update(
+                                codec, spec->autocfg.hp_pins[i],
+                                0, HDA_OUTPUT, 0, HDA_AMP_MUTE,
+                                lmute);
+                        snd_hda_codec_amp_update(
+                                codec, spec->autocfg.hp_pins[i],
+                                1, HDA_OUTPUT, 0, HDA_AMP_MUTE,
+                                rmute);
+                }
+        }
 
-        /* PCM information */
-        struct hda_pcm pcm_rec[3];
+        if (!lmute && !rmute) {
+                /* Line Outs */
+                for (i = 0; i < spec->autocfg.line_outs; i++)
+                        snd_hda_codec_amp_stereo(
+                                codec, spec->autocfg.line_out_pins[i],
+                                HDA_OUTPUT, 0, HDA_AMP_MUTE, 0);
+                /* Speakers */
+                for (i = 0; i < spec->autocfg.speaker_outs; i++)
+                        snd_hda_codec_amp_stereo(
+                                codec, spec->autocfg.speaker_pins[i],
+                                HDA_OUTPUT, 0, HDA_AMP_MUTE, 0);
+                /* unmute */
+                via_hp_bind_automute(codec);
 
-        /* dynamic controls, init_verbs and input_mux */
-        struct auto_pin_cfg autocfg;
-        struct snd_array kctls;
-        struct hda_input_mux private_imux[2];
-        hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
+        } else {
+                if (lmute) {
+                        /* Mute all left channels */
+                        for (i = 1; i < spec->autocfg.line_outs; i++)
+                                snd_hda_codec_amp_update(
+                                        codec,
+                                        spec->autocfg.line_out_pins[i],
+                                        0, HDA_OUTPUT, 0, HDA_AMP_MUTE,
+                                        lmute);
+                        for (i = 0; i < spec->autocfg.speaker_outs; i++)
+                                snd_hda_codec_amp_update(
+                                        codec,
+                                        spec->autocfg.speaker_pins[i],
+                                        0, HDA_OUTPUT, 0, HDA_AMP_MUTE,
+                                        lmute);
+                }
+                if (rmute) {
+                        /* mute all right channels */
+                        for (i = 1; i < spec->autocfg.line_outs; i++)
+                                snd_hda_codec_amp_update(
+                                        codec,
+                                        spec->autocfg.line_out_pins[i],
+                                        1, HDA_OUTPUT, 0, HDA_AMP_MUTE,
+                                        rmute);
+                        for (i = 0; i < spec->autocfg.speaker_outs; i++)
+                                snd_hda_codec_amp_update(
+                                        codec,
+                                        spec->autocfg.speaker_pins[i],
+                                        1, HDA_OUTPUT, 0, HDA_AMP_MUTE,
+                                        rmute);
+                }
+        }
+        return change;
+}
 
-        /* HP mode source */
-        const struct hda_input_mux *hp_mux;
-        unsigned int hp_independent_mode;
+#define BIND_PIN_MUTE                                                   \
+        {               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,            \
+                        .name = NULL,                                   \
+                        .index = 0,                                     \
+                        .info = snd_hda_mixer_amp_switch_info,          \
+                        .get = snd_hda_mixer_amp_switch_get,            \
+                        .put = bind_pin_switch_put,                     \
+                        .private_value = HDA_COMPOSE_AMP_VAL(0, 3, 0, 0) }
 
-#ifdef CONFIG_SND_HDA_POWER_SAVE
-        struct hda_loopback_check loopback;
-#endif
+static struct snd_kcontrol_new via_control_templates[] = {
+        HDA_CODEC_VOLUME(NULL, 0, 0, 0),
+        HDA_CODEC_MUTE(NULL, 0, 0, 0),
+        ANALOG_INPUT_MUTE,
+        BIND_PIN_MUTE,
 };
 
 static hda_nid_t vt1708_adc_nids[2] = {
@@ -261,6 +422,27 @@ static hda_nid_t vt1702_adc_nids[3] = {
         0x12, 0x20, 0x1F
 };
 
+static hda_nid_t vt1718S_adc_nids[2] = {
+        /* ADC1-2 */
+        0x10, 0x11
+};
+
+static hda_nid_t vt1716S_adc_nids[2] = {
+        /* ADC1-2 */
+        0x13, 0x14
+};
+
+static hda_nid_t vt2002P_adc_nids[2] = {
+        /* ADC1-2 */
+        0x10, 0x11
+};
+
+static hda_nid_t vt1812_adc_nids[2] = {
+        /* ADC1-2 */
+        0x10, 0x11
+};
+
+
 /* add dynamic controls */
 static int via_add_control(struct via_spec *spec, int type, const char *name,
                            unsigned long val)
@@ -271,14 +453,32 @@ static int via_add_control(struct via_spec *spec, int type, const char *name,
         knew = snd_array_new(&spec->kctls);
         if (!knew)
                 return -ENOMEM;
-        *knew = vt1708_control_templates[type];
+        *knew = via_control_templates[type];
         knew->name = kstrdup(name, GFP_KERNEL);
         if (!knew->name)
                 return -ENOMEM;
+        if (get_amp_nid_(val))
+                knew->subdevice = HDA_SUBDEV_AMP_FLAG;
         knew->private_value = val;
         return 0;
 }
 
+static struct snd_kcontrol_new *via_clone_control(struct via_spec *spec,
+                                                struct snd_kcontrol_new *tmpl)
+{
+        struct snd_kcontrol_new *knew;
+
+        snd_array_init(&spec->kctls, sizeof(*knew), 32);
+        knew = snd_array_new(&spec->kctls);
+        if (!knew)
+                return NULL;
+        *knew = *tmpl;
+        knew->name = kstrdup(tmpl->name, GFP_KERNEL);
+        if (!knew->name)
+                return NULL;
+        return knew;
+}
+
 static void via_free_kctls(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
@@ -293,8 +493,8 @@ static void via_free_kctls(struct hda_codec *codec)
 }
 
 /* create input playback/capture controls for the given pin */
-static int via_new_analog_input(struct via_spec *spec, hda_nid_t pin,
-                                const char *ctlname, int idx, int mix_nid)
+static int via_new_analog_input(struct via_spec *spec, const char *ctlname,
+                                int idx, int mix_nid)
 {
         char name[32];
         int err;
@@ -305,7 +505,7 @@ static int via_new_analog_input(struct via_spec *spec, hda_nid_t pin,
         if (err < 0)
                 return err;
         sprintf(name, "%s Playback Switch", ctlname);
-        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
+        err = via_add_control(spec, VIA_CTL_WIDGET_ANALOG_MUTE, name,
                               HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
         if (err < 0)
                 return err;
@@ -322,7 +522,7 @@ static void via_auto_set_output_and_unmute(struct hda_codec *codec,
         snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
                             AMP_OUT_UNMUTE);
         if (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_EAPD)
-                snd_hda_codec_write(codec, nid, 0, 
+                snd_hda_codec_write(codec, nid, 0,
                                     AC_VERB_SET_EAPD_BTLENABLE, 0x02);
 }
 
@@ -343,10 +543,13 @@ static void via_auto_init_hp_out(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
         hda_nid_t pin;
+        int i;
 
-        pin = spec->autocfg.hp_pins[0];
-        if (pin) /* connect to front */
-                via_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
+        for (i = 0; i < spec->autocfg.hp_outs; i++) {
+                pin = spec->autocfg.hp_pins[i];
+                if (pin) /* connect to front */
+                        via_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
+        }
 }
 
 static void via_auto_init_analog_input(struct hda_codec *codec)
@@ -364,6 +567,502 @@ static void via_auto_init_analog_input(struct hda_codec *codec)
 
         }
 }
+
+static int is_smart51_pins(struct via_spec *spec, hda_nid_t pin);
+
+static void set_pin_power_state(struct hda_codec *codec, hda_nid_t nid,
+                                unsigned int *affected_parm)
+{
+        unsigned parm;
+        unsigned def_conf = snd_hda_codec_get_pincfg(codec, nid);
+        unsigned no_presence = (def_conf & AC_DEFCFG_MISC)
+                >> AC_DEFCFG_MISC_SHIFT
+                & AC_DEFCFG_MISC_NO_PRESENCE; /* do not support pin sense */
+        unsigned present = snd_hda_jack_detect(codec, nid);
+        struct via_spec *spec = codec->spec;
+        if ((spec->smart51_enabled && is_smart51_pins(spec, nid))
+            || ((no_presence || present)
+                && get_defcfg_connect(def_conf) != AC_JACK_PORT_NONE)) {
+                *affected_parm = AC_PWRST_D0; /* if it's connected */
+                parm = AC_PWRST_D0;
+        } else
+                parm = AC_PWRST_D3;
+
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE, parm);
+}
+
+static void set_jack_power_state(struct hda_codec *codec)
+{
+        struct via_spec *spec = codec->spec;
+        int imux_is_smixer;
+        unsigned int parm;
+
+        if (spec->codec_type == VT1702) {
+                imux_is_smixer = snd_hda_codec_read(
+                        codec, 0x13, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;
+                /* inputs */
+                /* PW 1/2/5 (14h/15h/18h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x14, &parm);
+                set_pin_power_state(codec, 0x15, &parm);
+                set_pin_power_state(codec, 0x18, &parm);
+                if (imux_is_smixer)
+                        parm = AC_PWRST_D0; /* SW0 = stereo mixer (idx 3) */
+                /* SW0 (13h), AIW 0/1/2 (12h/1fh/20h) */
+                snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x12, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* outputs */
+                /* PW 3/4 (16h/17h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x16, &parm);
+                set_pin_power_state(codec, 0x17, &parm);
+                /* MW0 (1ah), AOW 0/1 (10h/1dh) */
+                snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE,
+                                    imux_is_smixer ? AC_PWRST_D0 : parm);
+                snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x1d, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+        } else if (spec->codec_type == VT1708B_8CH
+                   || spec->codec_type == VT1708B_4CH
+                   || spec->codec_type == VT1708S) {
+                /* SW0 (17h) = stereo mixer */
+                int is_8ch = spec->codec_type != VT1708B_4CH;
+                imux_is_smixer = snd_hda_codec_read(
+                        codec, 0x17, 0, AC_VERB_GET_CONNECT_SEL, 0x00)
+                        == ((spec->codec_type == VT1708S)  ? 5 : 0);
+                /* inputs */
+                /* PW 1/2/5 (1ah/1bh/1eh) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x1a, &parm);
+                set_pin_power_state(codec, 0x1b, &parm);
+                set_pin_power_state(codec, 0x1e, &parm);
+                if (imux_is_smixer)
+                        parm = AC_PWRST_D0;
+                /* SW0 (17h), AIW 0/1 (13h/14h) */
+                snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* outputs */
+                /* PW0 (19h), SW1 (18h), AOW1 (11h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x19, &parm);
+                snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* PW6 (22h), SW2 (26h), AOW2 (24h) */
+                if (is_8ch) {
+                        parm = AC_PWRST_D3;
+                        set_pin_power_state(codec, 0x22, &parm);
+                        snd_hda_codec_write(codec, 0x26, 0,
+                                            AC_VERB_SET_POWER_STATE, parm);
+                        snd_hda_codec_write(codec, 0x24, 0,
+                                            AC_VERB_SET_POWER_STATE, parm);
+                }
+
+                /* PW 3/4/7 (1ch/1dh/23h) */
+                parm = AC_PWRST_D3;
+                /* force to D0 for internal Speaker */
+                set_pin_power_state(codec, 0x1c, &parm);
+                set_pin_power_state(codec, 0x1d, &parm);
+                if (is_8ch)
+                        set_pin_power_state(codec, 0x23, &parm);
+                /* MW0 (16h), Sw3 (27h), AOW 0/3 (10h/25h) */
+                snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,
+                                    imux_is_smixer ? AC_PWRST_D0 : parm);
+                snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                if (is_8ch) {
+                        snd_hda_codec_write(codec, 0x25, 0,
+                                            AC_VERB_SET_POWER_STATE, parm);
+                        snd_hda_codec_write(codec, 0x27, 0,
+                                            AC_VERB_SET_POWER_STATE, parm);
+                }
+        }  else if (spec->codec_type == VT1718S) {
+                /* MUX6 (1eh) = stereo mixer */
+                imux_is_smixer = snd_hda_codec_read(
+                        codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;
+                /* inputs */
+                /* PW 5/6/7 (29h/2ah/2bh) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x29, &parm);
+                set_pin_power_state(codec, 0x2a, &parm);
+                set_pin_power_state(codec, 0x2b, &parm);
+                if (imux_is_smixer)
+                        parm = AC_PWRST_D0;
+                /* MUX6/7 (1eh/1fh), AIW 0/1 (10h/11h) */
+                snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* outputs */
+                /* PW3 (27h), MW2 (1ah), AOW3 (bh) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x27, &parm);
+                snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0xb, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* PW2 (26h), AOW2 (ah) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x26, &parm);
+                snd_hda_codec_write(codec, 0xa, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* PW0/1 (24h/25h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x24, &parm);
+                set_pin_power_state(codec, 0x25, &parm);
+                if (!spec->hp_independent_mode) /* check for redirected HP */
+                        set_pin_power_state(codec, 0x28, &parm);
+                snd_hda_codec_write(codec, 0x8, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x9, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                /* MW9 (21h), Mw2 (1ah), AOW0 (8h) */
+                snd_hda_codec_write(codec, 0x21, 0, AC_VERB_SET_POWER_STATE,
+                                    imux_is_smixer ? AC_PWRST_D0 : parm);
+                if (spec->hp_independent_mode) {
+                        /* PW4 (28h), MW3 (1bh), MUX1(34h), AOW4 (ch) */
+                        parm = AC_PWRST_D3;
+                        set_pin_power_state(codec, 0x28, &parm);
+                        snd_hda_codec_write(codec, 0x1b, 0,
+                                            AC_VERB_SET_POWER_STATE, parm);
+                        snd_hda_codec_write(codec, 0x34, 0,
+                                            AC_VERB_SET_POWER_STATE, parm);
+                        snd_hda_codec_write(codec, 0xc, 0,
+                                            AC_VERB_SET_POWER_STATE, parm);
+                }
+        } else if (spec->codec_type == VT1716S) {
+                unsigned int mono_out, present;
+                /* SW0 (17h) = stereo mixer */
+                imux_is_smixer = snd_hda_codec_read(
+                        codec, 0x17, 0, AC_VERB_GET_CONNECT_SEL, 0x00) ==  5;
+                /* inputs */
+                /* PW 1/2/5 (1ah/1bh/1eh) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x1a, &parm);
+                set_pin_power_state(codec, 0x1b, &parm);
+                set_pin_power_state(codec, 0x1e, &parm);
+                if (imux_is_smixer)
+                        parm = AC_PWRST_D0;
+                /* SW0 (17h), AIW0(13h) */
+                snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x1e, &parm);
+                /* PW11 (22h) */
+                if (spec->dmic_enabled)
+                        set_pin_power_state(codec, 0x22, &parm);
+                else
+                        snd_hda_codec_write(
+                                codec, 0x22, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+
+                /* SW2(26h), AIW1(14h) */
+                snd_hda_codec_write(codec, 0x26, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* outputs */
+                /* PW0 (19h), SW1 (18h), AOW1 (11h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x19, &parm);
+                /* Smart 5.1 PW2(1bh) */
+                if (spec->smart51_enabled)
+                        set_pin_power_state(codec, 0x1b, &parm);
+                snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* PW7 (23h), SW3 (27h), AOW3 (25h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x23, &parm);
+                /* Smart 5.1 PW1(1ah) */
+                if (spec->smart51_enabled)
+                        set_pin_power_state(codec, 0x1a, &parm);
+                snd_hda_codec_write(codec, 0x27, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* Smart 5.1 PW5(1eh) */
+                if (spec->smart51_enabled)
+                        set_pin_power_state(codec, 0x1e, &parm);
+                snd_hda_codec_write(codec, 0x25, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* Mono out */
+                /* SW4(28h)->MW1(29h)-> PW12 (2ah)*/
+                present = snd_hda_jack_detect(codec, 0x1c);
+                if (present)
+                        mono_out = 0;
+                else {
+                        present = snd_hda_jack_detect(codec, 0x1d);
+                        if (!spec->hp_independent_mode && present)
+                                mono_out = 0;
+                        else
+                                mono_out = 1;
+                }
+                parm = mono_out ? AC_PWRST_D0 : AC_PWRST_D3;
+                snd_hda_codec_write(codec, 0x28, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x29, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+                snd_hda_codec_write(codec, 0x2a, 0, AC_VERB_SET_POWER_STATE,
+                                    parm);
+
+                /* PW 3/4 (1ch/1dh) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x1c, &parm);
+                set_pin_power_state(codec, 0x1d, &parm);
+                /* HP Independent Mode, power on AOW3 */
+                if (spec->hp_independent_mode)
+                        snd_hda_codec_write(codec, 0x25, 0,
+                                            AC_VERB_SET_POWER_STATE, parm);
+
+                /* force to D0 for internal Speaker */
+                /* MW0 (16h), AOW0 (10h) */
+                snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,
+                                    imux_is_smixer ? AC_PWRST_D0 : parm);
+                snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
+                                    mono_out ? AC_PWRST_D0 : parm);
+        } else if (spec->codec_type == VT2002P) {
+                unsigned int present;
+                /* MUX9 (1eh) = stereo mixer */
+                imux_is_smixer = snd_hda_codec_read(
+                        codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;
+                /* inputs */
+                /* PW 5/6/7 (29h/2ah/2bh) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x29, &parm);
+                set_pin_power_state(codec, 0x2a, &parm);
+                set_pin_power_state(codec, 0x2b, &parm);
+                if (imux_is_smixer)
+                        parm = AC_PWRST_D0;
+                /* MUX9/10 (1eh/1fh), AIW 0/1 (10h/11h) */
+                snd_hda_codec_write(codec, 0x1e, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x1f, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x10, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x11, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+
+                /* outputs */
+                /* AOW0 (8h)*/
+                snd_hda_codec_write(codec, 0x8, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+
+                /* PW4 (26h), MW4 (1ch), MUX4(37h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x26, &parm);
+                snd_hda_codec_write(codec, 0x1c, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x37,
+                                    0, AC_VERB_SET_POWER_STATE, parm);
+
+                /* PW1 (25h), MW1 (19h), MUX1(35h), AOW1 (9h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x25, &parm);
+                snd_hda_codec_write(codec, 0x19, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x35, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                if (spec->hp_independent_mode)  {
+                        snd_hda_codec_write(codec, 0x9, 0,
+                                            AC_VERB_SET_POWER_STATE, parm);
+                }
+
+                /* Class-D */
+                /* PW0 (24h), MW0(18h), MUX0(34h) */
+                present = snd_hda_jack_detect(codec, 0x25);
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x24, &parm);
+                if (present) {
+                        snd_hda_codec_write(
+                                codec, 0x18, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                        snd_hda_codec_write(
+                                codec, 0x34, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                } else {
+                        snd_hda_codec_write(
+                                codec, 0x18, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                        snd_hda_codec_write(
+                                codec, 0x34, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                }
+
+                /* Mono Out */
+                /* PW15 (31h), MW8(17h), MUX8(3bh) */
+                present = snd_hda_jack_detect(codec, 0x26);
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x31, &parm);
+                if (present) {
+                        snd_hda_codec_write(
+                                codec, 0x17, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                        snd_hda_codec_write(
+                                codec, 0x3b, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                } else {
+                        snd_hda_codec_write(
+                                codec, 0x17, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                        snd_hda_codec_write(
+                                codec, 0x3b, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                }
+
+                /* MW9 (21h) */
+                if (imux_is_smixer || !is_aa_path_mute(codec))
+                        snd_hda_codec_write(
+                                codec, 0x21, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                else
+                        snd_hda_codec_write(
+                                codec, 0x21, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+        } else if (spec->codec_type == VT1812) {
+                unsigned int present;
+                /* MUX10 (1eh) = stereo mixer */
+                imux_is_smixer = snd_hda_codec_read(
+                        codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;
+                /* inputs */
+                /* PW 5/6/7 (29h/2ah/2bh) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x29, &parm);
+                set_pin_power_state(codec, 0x2a, &parm);
+                set_pin_power_state(codec, 0x2b, &parm);
+                if (imux_is_smixer)
+                        parm = AC_PWRST_D0;
+                /* MUX10/11 (1eh/1fh), AIW 0/1 (10h/11h) */
+                snd_hda_codec_write(codec, 0x1e, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x1f, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x10, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x11, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+
+                /* outputs */
+                /* AOW0 (8h)*/
+                snd_hda_codec_write(codec, 0x8, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+
+                /* PW4 (28h), MW4 (18h), MUX4(38h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x28, &parm);
+                snd_hda_codec_write(codec, 0x18, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x38, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+
+                /* PW1 (25h), MW1 (15h), MUX1(35h), AOW1 (9h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x25, &parm);
+                snd_hda_codec_write(codec, 0x15, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x35, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                if (spec->hp_independent_mode)  {
+                        snd_hda_codec_write(codec, 0x9, 0,
+                                            AC_VERB_SET_POWER_STATE, parm);
+                }
+
+                /* Internal Speaker */
+                /* PW0 (24h), MW0(14h), MUX0(34h) */
+                present = snd_hda_jack_detect(codec, 0x25);
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x24, &parm);
+                if (present) {
+                        snd_hda_codec_write(codec, 0x14, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            AC_PWRST_D3);
+                        snd_hda_codec_write(codec, 0x34, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            AC_PWRST_D3);
+                } else {
+                        snd_hda_codec_write(codec, 0x14, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            AC_PWRST_D0);
+                        snd_hda_codec_write(codec, 0x34, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            AC_PWRST_D0);
+                }
+                /* Mono Out */
+                /* PW13 (31h), MW13(1ch), MUX13(3ch), MW14(3eh) */
+                present = snd_hda_jack_detect(codec, 0x28);
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x31, &parm);
+                if (present) {
+                        snd_hda_codec_write(codec, 0x1c, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            AC_PWRST_D3);
+                        snd_hda_codec_write(codec, 0x3c, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            AC_PWRST_D3);
+                        snd_hda_codec_write(codec, 0x3e, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            AC_PWRST_D3);
+                } else {
+                        snd_hda_codec_write(codec, 0x1c, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            AC_PWRST_D0);
+                        snd_hda_codec_write(codec, 0x3c, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            AC_PWRST_D0);
+                        snd_hda_codec_write(codec, 0x3e, 0,
+                                            AC_VERB_SET_POWER_STATE,
+                                            AC_PWRST_D0);
+                }
+
+                /* PW15 (33h), MW15 (1dh), MUX15(3dh) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x33, &parm);
+                snd_hda_codec_write(codec, 0x1d, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x3d, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+
+                /* MW9 (21h) */
+                if (imux_is_smixer || !is_aa_path_mute(codec))
+                        snd_hda_codec_write(
+                                codec, 0x21, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                else
+                        snd_hda_codec_write(
+                                codec, 0x21, 0,
+                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+        }
+}
+
 /*
  * input MUX handling
  */
@@ -395,6 +1094,14 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
 
         if (!spec->mux_nids[adc_idx])
                 return -EINVAL;
+        /* switch to D0 beofre change index */
+        if (snd_hda_codec_read(codec, spec->mux_nids[adc_idx], 0,
+                               AC_VERB_GET_POWER_STATE, 0x00) != AC_PWRST_D0)
+                snd_hda_codec_write(codec, spec->mux_nids[adc_idx], 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+        /* update jack power state */
+        set_jack_power_state(codec);
+
         return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
                                      spec->mux_nids[adc_idx],
                                      &spec->cur_mux[adc_idx]);
@@ -412,80 +1119,340 @@ static int via_independent_hp_get(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct via_spec *spec = codec->spec;
-        hda_nid_t nid = spec->autocfg.hp_pins[0];
-        unsigned int pinsel = snd_hda_codec_read(codec, nid, 0,
-                                                 AC_VERB_GET_CONNECT_SEL,
-                                                 0x00);
+        hda_nid_t nid = kcontrol->private_value;
+        unsigned int pinsel;
 
+        /* use !! to translate conn sel 2 for VT1718S */
+        pinsel = !!snd_hda_codec_read(codec, nid, 0,
+                                      AC_VERB_GET_CONNECT_SEL,
+                                      0x00);
         ucontrol->value.enumerated.item[0] = pinsel;
 
         return 0;
 }
 
+static void activate_ctl(struct hda_codec *codec, const char *name, int active)
+{
+        struct snd_kcontrol *ctl = snd_hda_find_mixer_ctl(codec, name);
+        if (ctl) {
+                ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+                ctl->vd[0].access |= active
+                        ? 0 : SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+                snd_ctl_notify(codec->bus->card,
+                               SNDRV_CTL_EVENT_MASK_VALUE, &ctl->id);
+        }
+}
+
+static hda_nid_t side_mute_channel(struct via_spec *spec)
+{
+        switch (spec->codec_type) {
+        case VT1708:            return 0x1b;
+        case VT1709_10CH:       return 0x29;
+        case VT1708B_8CH:       /* fall thru */
+        case VT1708S:           return 0x27;
+        default:                return 0;
+        }
+}
+
+static int update_side_mute_status(struct hda_codec *codec)
+{
+        /* mute side channel */
+        struct via_spec *spec = codec->spec;
+        unsigned int parm = spec->hp_independent_mode
+                ? AMP_OUT_MUTE : AMP_OUT_UNMUTE;
+        hda_nid_t sw3 = side_mute_channel(spec);
+
+        if (sw3)
+                snd_hda_codec_write(codec, sw3, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                    parm);
+        return 0;
+}
+
 static int via_independent_hp_put(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct via_spec *spec = codec->spec;
-        hda_nid_t nid = spec->autocfg.hp_pins[0];
+        hda_nid_t nid = kcontrol->private_value;
         unsigned int pinsel = ucontrol->value.enumerated.item[0];
-        unsigned int con_nid = snd_hda_codec_read(codec, nid, 0,
-                                         AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
-
-        if (con_nid == spec->multiout.hp_nid) {
-                if (pinsel == 0) {
-                        if (!spec->hp_independent_mode) {
-                                if (spec->multiout.num_dacs > 1)
-                                        spec->multiout.num_dacs -= 1;
-                                spec->hp_independent_mode = 1;
-                        }
-                } else if (pinsel == 1) {
-                       if (spec->hp_independent_mode) {
-                                if (spec->multiout.num_dacs > 1)
-                                        spec->multiout.num_dacs += 1;
-                                spec->hp_independent_mode = 0;
-                       }
-                }
-        } else {
-                if (pinsel == 0) {
-                        if (spec->hp_independent_mode) {
-                                if (spec->multiout.num_dacs > 1)
-                                        spec->multiout.num_dacs += 1;
-                                spec->hp_independent_mode = 0;
-                        }
-                } else if (pinsel == 1) {
-                       if (!spec->hp_independent_mode) {
-                                if (spec->multiout.num_dacs > 1)
-                                        spec->multiout.num_dacs -= 1;
-                                spec->hp_independent_mode = 1;
-                       }
-                }
+        /* Get Independent Mode index of headphone pin widget */
+        spec->hp_independent_mode = spec->hp_independent_mode_index == pinsel
+                ? 1 : 0;
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, pinsel);
+
+        if (spec->multiout.hp_nid && spec->multiout.hp_nid
+            != spec->multiout.dac_nids[HDA_FRONT])
+                snd_hda_codec_setup_stream(codec, spec->multiout.hp_nid,
+                                           0, 0, 0);
+
+        update_side_mute_status(codec);
+        /* update HP volume/swtich active state */
+        if (spec->codec_type == VT1708S
+            || spec->codec_type == VT1702
+            || spec->codec_type == VT1718S
+            || spec->codec_type == VT1716S
+            || spec->codec_type == VT2002P
+            || spec->codec_type == VT1812) {
+                activate_ctl(codec, "Headphone Playback Volume",
+                             spec->hp_independent_mode);
+                activate_ctl(codec, "Headphone Playback Switch",
+                             spec->hp_independent_mode);
         }
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,
-                            pinsel);
-
-        if (spec->multiout.hp_nid &&
-            spec->multiout.hp_nid != spec->multiout.dac_nids[HDA_FRONT])
-                        snd_hda_codec_setup_stream(codec,
-                                                   spec->multiout.hp_nid,
-                                                   0, 0, 0);
-
         return 0;
 }
 
-static struct snd_kcontrol_new via_hp_mixer[] = {
+static struct snd_kcontrol_new via_hp_mixer[2] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Independent HP",
-                .count = 1,
                 .info = via_independent_hp_info,
                 .get = via_independent_hp_get,
                 .put = via_independent_hp_put,
         },
-        { } /* end */
+        {
+                .iface = NID_MAPPING,
+                .name = "Independent HP",
+        },
+};
+
+static int via_hp_build(struct hda_codec *codec)
+{
+        struct via_spec *spec = codec->spec;
+        struct snd_kcontrol_new *knew;
+        hda_nid_t nid;
+        int nums;
+        hda_nid_t conn[HDA_MAX_CONNECTIONS];
+
+        switch (spec->codec_type) {
+        case VT1718S:
+                nid = 0x34;
+                break;
+        case VT2002P:
+                nid = 0x35;
+                break;
+        case VT1812:
+                nid = 0x3d;
+                break;
+        default:
+                nid = spec->autocfg.hp_pins[0];
+                break;
+        }
+
+        nums = snd_hda_get_connections(codec, nid, conn, HDA_MAX_CONNECTIONS);
+        if (nums <= 1)
+                return 0;
+
+        knew = via_clone_control(spec, &via_hp_mixer[0]);
+        if (knew == NULL)
+                return -ENOMEM;
+
+        knew->subdevice = HDA_SUBDEV_NID_FLAG | nid;
+        knew->private_value = nid;
+
+        knew = via_clone_control(spec, &via_hp_mixer[1]);
+        if (knew == NULL)
+                return -ENOMEM;
+        knew->subdevice = side_mute_channel(spec);
+
+        return 0;
+}
+
+static void notify_aa_path_ctls(struct hda_codec *codec)
+{
+        int i;
+        struct snd_ctl_elem_id id;
+        const char *labels[] = {"Mic", "Front Mic", "Line"};
+
+        memset(&id, 0, sizeof(id));
+        id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        for (i = 0; i < ARRAY_SIZE(labels); i++) {
+                sprintf(id.name, "%s Playback Volume", labels[i]);
+                snd_ctl_notify(codec->bus->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                               &id);
+        }
+}
+
+static void mute_aa_path(struct hda_codec *codec, int mute)
+{
+        struct via_spec *spec = codec->spec;
+        hda_nid_t  nid_mixer;
+        int start_idx;
+        int end_idx;
+        int i;
+        /* get nid of MW0 and start & end index */
+        switch (spec->codec_type) {
+        case VT1708:
+                nid_mixer = 0x17;
+                start_idx = 2;
+                end_idx = 4;
+                break;
+        case VT1709_10CH:
+        case VT1709_6CH:
+                nid_mixer = 0x18;
+                start_idx = 2;
+                end_idx = 4;
+                break;
+        case VT1708B_8CH:
+        case VT1708B_4CH:
+        case VT1708S:
+        case VT1716S:
+                nid_mixer = 0x16;
+                start_idx = 2;
+                end_idx = 4;
+                break;
+        default:
+                return;
+        }
+        /* check AA path's mute status */
+        for (i = start_idx; i <= end_idx; i++) {
+                int val = mute ? HDA_AMP_MUTE : HDA_AMP_UNMUTE;
+                snd_hda_codec_amp_stereo(codec, nid_mixer, HDA_INPUT, i,
+                                         HDA_AMP_MUTE, val);
+        }
+}
+static int is_smart51_pins(struct via_spec *spec, hda_nid_t pin)
+{
+        int res = 0;
+        int index;
+        for (index = AUTO_PIN_MIC; index < AUTO_PIN_FRONT_LINE; index++) {
+                if (pin == spec->autocfg.input_pins[index]) {
+                        res = 1;
+                        break;
+                }
+        }
+        return res;
+}
+
+static int via_smart51_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 via_smart51_get(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct via_spec *spec = codec->spec;
+        int index[] = { AUTO_PIN_MIC, AUTO_PIN_FRONT_MIC, AUTO_PIN_LINE };
+        int on = 1;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(index); i++) {
+                hda_nid_t nid = spec->autocfg.input_pins[index[i]];
+                if (nid) {
+                        int ctl =
+                            snd_hda_codec_read(codec, nid, 0,
+                                               AC_VERB_GET_PIN_WIDGET_CONTROL,
+                                               0);
+                        if (i == AUTO_PIN_FRONT_MIC
+                            && spec->hp_independent_mode
+                            && spec->codec_type != VT1718S)
+                                continue; /* ignore FMic for independent HP */
+                        if (ctl & AC_PINCTL_IN_EN
+                            && !(ctl & AC_PINCTL_OUT_EN))
+                                on = 0;
+                }
+        }
+        *ucontrol->value.integer.value = on;
+        return 0;
+}
+
+static int via_smart51_put(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct via_spec *spec = codec->spec;
+        int out_in = *ucontrol->value.integer.value
+                ? AC_PINCTL_OUT_EN : AC_PINCTL_IN_EN;
+        int index[] = { AUTO_PIN_MIC, AUTO_PIN_FRONT_MIC, AUTO_PIN_LINE };
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(index); i++) {
+                hda_nid_t nid = spec->autocfg.input_pins[index[i]];
+                if (i == AUTO_PIN_FRONT_MIC
+                    && spec->hp_independent_mode
+                    && spec->codec_type != VT1718S)
+                        continue; /* don't retask FMic for independent HP */
+                if (nid) {
+                        unsigned int parm = snd_hda_codec_read(
+                                codec, nid, 0,
+                                AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                        parm &= ~(AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN);
+                        parm |= out_in;
+                        snd_hda_codec_write(codec, nid, 0,
+                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                            parm);
+                        if (out_in == AC_PINCTL_OUT_EN) {
+                                mute_aa_path(codec, 1);
+                                notify_aa_path_ctls(codec);
+                        }
+                        if (spec->codec_type == VT1718S)
+                                snd_hda_codec_amp_stereo(
+                                        codec, nid, HDA_OUTPUT, 0, HDA_AMP_MUTE,
+                                        HDA_AMP_UNMUTE);
+                }
+                if (i == AUTO_PIN_FRONT_MIC) {
+                        if (spec->codec_type == VT1708S
+                            || spec->codec_type == VT1716S) {
+                                /* input = index 1 (AOW3) */
+                                snd_hda_codec_write(
+                                        codec, nid, 0,
+                                        AC_VERB_SET_CONNECT_SEL, 1);
+                                snd_hda_codec_amp_stereo(
+                                        codec, nid, HDA_OUTPUT,
+                                        0, HDA_AMP_MUTE, HDA_AMP_UNMUTE);
+                        }
+                }
+        }
+        spec->smart51_enabled = *ucontrol->value.integer.value;
+        set_jack_power_state(codec);
+        return 1;
+}
+
+static struct snd_kcontrol_new via_smart51_mixer[2] = {
+        {
+         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+         .name = "Smart 5.1",
+         .count = 1,
+         .info = via_smart51_info,
+         .get = via_smart51_get,
+         .put = via_smart51_put,
+         },
+        {
+         .iface = NID_MAPPING,
+         .name = "Smart 5.1",
+        }
 };
 
+static int via_smart51_build(struct via_spec *spec)
+{
+        struct snd_kcontrol_new *knew;
+        int index[] = { AUTO_PIN_MIC, AUTO_PIN_FRONT_MIC, AUTO_PIN_LINE };
+        hda_nid_t nid;
+        int i;
+
+        knew = via_clone_control(spec, &via_smart51_mixer[0]);
+        if (knew == NULL)
+                return -ENOMEM;
+
+        for (i = 0; i < ARRAY_SIZE(index); i++) {
+                nid = spec->autocfg.input_pins[index[i]];
+                if (nid) {
+                        knew = via_clone_control(spec, &via_smart51_mixer[1]);
+                        if (knew == NULL)
+                                return -ENOMEM;
+                        knew->subdevice = nid;
+                }
+        }
+
+        return 0;
+}
+
 /* capture mixer elements */
 static struct snd_kcontrol_new vt1708_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_INPUT),
@@ -506,6 +1473,112 @@ static struct snd_kcontrol_new vt1708_capture_mixer[] = {
         },
         { } /* end */
 };
+
+/* check AA path's mute statue */
+static int is_aa_path_mute(struct hda_codec *codec)
+{
+        int mute = 1;
+        hda_nid_t  nid_mixer;
+        int start_idx;
+        int end_idx;
+        int i;
+        struct via_spec *spec = codec->spec;
+        /* get nid of MW0 and start & end index */
+        switch (spec->codec_type) {
+        case VT1708B_8CH:
+        case VT1708B_4CH:
+        case VT1708S:
+        case VT1716S:
+                nid_mixer = 0x16;
+                start_idx = 2;
+                end_idx = 4;
+                break;
+        case VT1702:
+                nid_mixer = 0x1a;
+                start_idx = 1;
+                end_idx = 3;
+                break;
+        case VT1718S:
+                nid_mixer = 0x21;
+                start_idx = 1;
+                end_idx = 3;
+                break;
+        case VT2002P:
+        case VT1812:
+                nid_mixer = 0x21;
+                start_idx = 0;
+                end_idx = 2;
+                break;
+        default:
+                return 0;
+        }
+        /* check AA path's mute status */
+        for (i = start_idx; i <= end_idx; i++) {
+                unsigned int con_list = snd_hda_codec_read(
+                        codec, nid_mixer, 0, AC_VERB_GET_CONNECT_LIST, i/4*4);
+                int shift = 8 * (i % 4);
+                hda_nid_t nid_pin = (con_list & (0xff << shift)) >> shift;
+                unsigned int defconf = snd_hda_codec_get_pincfg(codec, nid_pin);
+                if (get_defcfg_connect(defconf) == AC_JACK_PORT_COMPLEX) {
+                        /* check mute status while the pin is connected */
+                        int mute_l = snd_hda_codec_amp_read(codec, nid_mixer, 0,
+                                                            HDA_INPUT, i) >> 7;
+                        int mute_r = snd_hda_codec_amp_read(codec, nid_mixer, 1,
+                                                            HDA_INPUT, i) >> 7;
+                        if (!mute_l || !mute_r) {
+                                mute = 0;
+                                break;
+                        }
+                }
+        }
+        return mute;
+}
+
+/* enter/exit analog low-current mode */
+static void analog_low_current_mode(struct hda_codec *codec, int stream_idle)
+{
+        struct via_spec *spec = codec->spec;
+        static int saved_stream_idle = 1; /* saved stream idle status */
+        int enable = is_aa_path_mute(codec);
+        unsigned int verb = 0;
+        unsigned int parm = 0;
+
+        if (stream_idle == -1)  /* stream status did not change */
+                enable = enable && saved_stream_idle;
+        else {
+                enable = enable && stream_idle;
+                saved_stream_idle = stream_idle;
+        }
+
+        /* decide low current mode's verb & parameter */
+        switch (spec->codec_type) {
+        case VT1708B_8CH:
+        case VT1708B_4CH:
+                verb = 0xf70;
+                parm = enable ? 0x02 : 0x00; /* 0x02: 2/3x, 0x00: 1x */
+                break;
+        case VT1708S:
+        case VT1718S:
+        case VT1716S:
+                verb = 0xf73;
+                parm = enable ? 0x51 : 0xe1; /* 0x51: 4/28x, 0xe1: 1x */
+                break;
+        case VT1702:
+                verb = 0xf73;
+                parm = enable ? 0x01 : 0x1d; /* 0x01: 4/40x, 0x1d: 1x */
+                break;
+        case VT2002P:
+        case VT1812:
+                verb = 0xf93;
+                parm = enable ? 0x00 : 0xe0; /* 0x00: 4/40x, 0xe0: 1x */
+                break;
+        default:
+                return;         /* other codecs are not supported */
+        }
+        /* send verb */
+        snd_hda_codec_write(codec, codec->afg, 0, verb, parm);
+}
+
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
@@ -534,9 +1607,9 @@ static struct hda_verb vt1708_volume_init_verbs[] = {
         {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        
-        /* Setup default input to PW4 */
-        {0x20, AC_VERB_SET_CONNECT_SEL, 0x1},
+
+        /* Setup default input MW0 to PW4 */
+        {0x20, AC_VERB_SET_CONNECT_SEL, 0},
         /* PW9 Output enable */
         {0x25, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
         { }
@@ -547,30 +1620,13 @@ static int via_playback_pcm_open(struct hda_pcm_stream *hinfo,
                                  struct snd_pcm_substream *substream)
 {
         struct via_spec *spec = codec->spec;
+        int idle = substream->pstr->substream_opened == 1
+                && substream->ref_count == 0;
+        analog_low_current_mode(codec, idle);
         return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
                                              hinfo);
 }
 
-static int via_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_analog_prepare(codec, &spec->multiout,
-                                                stream_tag, format, substream);
-}
-
-static int via_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                    struct hda_codec *codec,
-                                    struct snd_pcm_substream *substream)
-{
-        struct via_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
-}
-
-
 static void playback_multi_pcm_prep_0(struct hda_codec *codec,
                                       unsigned int stream_tag,
                                       unsigned int format,
@@ -615,8 +1671,8 @@ static void playback_multi_pcm_prep_0(struct hda_codec *codec,
         snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag,
                                    0, format);
 
-        if (mout->hp_nid && mout->hp_nid != nids[HDA_FRONT] &&
-            !spec->hp_independent_mode)
+        if (mout->hp_nid && mout->hp_nid != nids[HDA_FRONT]
+            && !spec->hp_independent_mode)
                 /* headphone out will just decode front left/right (stereo) */
                 snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag,
                                            0, format);
@@ -658,7 +1714,7 @@ static int via_playback_multi_pcm_prepare(struct hda_pcm_stream *hinfo,
                         snd_hda_codec_setup_stream(codec, mout->hp_nid,
                                                    stream_tag, 0, format);
         }
-
+        vt1708_start_hp_work(spec);
         return 0;
 }
 
@@ -698,7 +1754,7 @@ static int via_playback_multi_pcm_cleanup(struct hda_pcm_stream *hinfo,
                         snd_hda_codec_setup_stream(codec, mout->hp_nid,
                                                    0, 0, 0);
         }
-
+        vt1708_stop_hp_work(spec);
         return 0;
 }
 
@@ -779,7 +1835,7 @@ static struct hda_pcm_stream vt1708_pcm_analog_playback = {
 };
 
 static struct hda_pcm_stream vt1708_pcm_analog_s16_playback = {
-        .substreams = 1,
+        .substreams = 2,
         .channels_min = 2,
         .channels_max = 8,
         .nid = 0x10, /* NID to query formats and rates */
@@ -790,8 +1846,8 @@ static struct hda_pcm_stream vt1708_pcm_analog_s16_playback = {
         .formats = SNDRV_PCM_FMTBIT_S16_LE,
         .ops = {
                 .open = via_playback_pcm_open,
-                .prepare = via_playback_pcm_prepare,
-                .cleanup = via_playback_pcm_cleanup
+                .prepare = via_playback_multi_pcm_prepare,
+                .cleanup = via_playback_multi_pcm_cleanup
         },
 };
 
@@ -828,8 +1884,9 @@ static struct hda_pcm_stream vt1708_pcm_digital_capture = {
 static int via_build_controls(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
-        int err;
-        int i;
+        struct snd_kcontrol *kctl;
+        struct snd_kcontrol_new *knew;
+        int err, i;
 
         for (i = 0; i < spec->num_mixers; i++) {
                 err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
@@ -853,6 +1910,32 @@ static int via_build_controls(struct hda_codec *codec)
                 if (err < 0)
                         return err;
         }
+
+        /* assign Capture Source enums to NID */
+        kctl = snd_hda_find_mixer_ctl(codec, "Input Source");
+        for (i = 0; kctl && i < kctl->count; i++) {
+                err = snd_hda_add_nid(codec, kctl, i, spec->mux_nids[i]);
+                if (err < 0)
+                        return err;
+        }
+
+        /* other nid->control mapping */
+        for (i = 0; i < spec->num_mixers; i++) {
+                for (knew = spec->mixers[i]; knew->name; knew++) {
+                        if (knew->iface != NID_MAPPING)
+                                continue;
+                        kctl = snd_hda_find_mixer_ctl(codec, knew->name);
+                        if (kctl == NULL)
+                                continue;
+                        err = snd_hda_add_nid(codec, kctl, 0,
+                                              knew->subdevice);
+                }
+        }
+
+        /* init power states */
+        set_jack_power_state(codec);
+        analog_low_current_mode(codec, 1);
+
         via_free_kctls(codec); /* no longer needed */
         return 0;
 }
@@ -866,8 +1949,10 @@ static int via_build_pcms(struct hda_codec *codec)
         codec->pcm_info = info;
 
         info->name = spec->stream_name_analog;
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_analog_playback);
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
+                *(spec->stream_analog_playback);
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
+                spec->multiout.dac_nids[0];
         info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
 
@@ -904,20 +1989,58 @@ static void via_free(struct hda_codec *codec)
                 return;
 
         via_free_kctls(codec);
+        vt1708_stop_hp_work(spec);
         kfree(codec->spec);
 }
 
 /* mute internal speaker if HP is plugged */
 static void via_hp_automute(struct hda_codec *codec)
 {
-        unsigned int present;
+        unsigned int present = 0;
         struct via_spec *spec = codec->spec;
 
-        present = snd_hda_codec_read(codec, spec->autocfg.hp_pins[0], 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        snd_hda_codec_amp_stereo(codec, spec->autocfg.line_out_pins[0],
-                                 HDA_OUTPUT, 0, HDA_AMP_MUTE,
-                                 present ? HDA_AMP_MUTE : 0);
+        present = snd_hda_jack_detect(codec, spec->autocfg.hp_pins[0]);
+
+        if (!spec->hp_independent_mode) {
+                struct snd_ctl_elem_id id;
+                /* auto mute */
+                snd_hda_codec_amp_stereo(
+                        codec, spec->autocfg.line_out_pins[0], HDA_OUTPUT, 0,
+                        HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+                /* notify change */
+                memset(&id, 0, sizeof(id));
+                id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+                strcpy(id.name, "Front Playback Switch");
+                snd_ctl_notify(codec->bus->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                               &id);
+        }
+}
+
+/* mute mono out if HP or Line out is plugged */
+static void via_mono_automute(struct hda_codec *codec)
+{
+        unsigned int hp_present, lineout_present;
+        struct via_spec *spec = codec->spec;
+
+        if (spec->codec_type != VT1716S)
+                return;
+
+        lineout_present = snd_hda_jack_detect(codec,
+                                              spec->autocfg.line_out_pins[0]);
+
+        /* Mute Mono Out if Line Out is plugged */
+        if (lineout_present) {
+                snd_hda_codec_amp_stereo(
+                        codec, 0x2A, HDA_OUTPUT, 0, HDA_AMP_MUTE, HDA_AMP_MUTE);
+                return;
+        }
+
+        hp_present = snd_hda_jack_detect(codec, spec->autocfg.hp_pins[0]);
+
+        if (!spec->hp_independent_mode)
+                snd_hda_codec_amp_stereo(
+                        codec, 0x2A, HDA_OUTPUT, 0, HDA_AMP_MUTE,
+                        hp_present ? HDA_AMP_MUTE : 0);
 }
 
 static void via_gpio_control(struct hda_codec *codec)
@@ -968,15 +2091,83 @@ static void via_gpio_control(struct hda_codec *codec)
         }
 }
 
+/* mute Internal-Speaker if HP is plugged */
+static void via_speaker_automute(struct hda_codec *codec)
+{
+        unsigned int hp_present;
+        struct via_spec *spec = codec->spec;
+
+        if (spec->codec_type != VT2002P && spec->codec_type != VT1812)
+                return;
+
+        hp_present = snd_hda_jack_detect(codec, spec->autocfg.hp_pins[0]);
+
+        if (!spec->hp_independent_mode) {
+                struct snd_ctl_elem_id id;
+                snd_hda_codec_amp_stereo(
+                        codec, spec->autocfg.speaker_pins[0], HDA_OUTPUT, 0,
+                        HDA_AMP_MUTE, hp_present ? HDA_AMP_MUTE : 0);
+                /* notify change */
+                memset(&id, 0, sizeof(id));
+                id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+                strcpy(id.name, "Speaker Playback Switch");
+                snd_ctl_notify(codec->bus->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                               &id);
+        }
+}
+
+/* mute line-out and internal speaker if HP is plugged */
+static void via_hp_bind_automute(struct hda_codec *codec)
+{
+        /* use long instead of int below just to avoid an internal compiler
+         * error with gcc 4.0.x
+         */
+        unsigned long hp_present, present = 0;
+        struct via_spec *spec = codec->spec;
+        int i;
+
+        if (!spec->autocfg.hp_pins[0] || !spec->autocfg.line_out_pins[0])
+                return;
+
+        hp_present = snd_hda_jack_detect(codec, spec->autocfg.hp_pins[0]);
+
+        present = snd_hda_jack_detect(codec, spec->autocfg.line_out_pins[0]);
+
+        if (!spec->hp_independent_mode) {
+                /* Mute Line-Outs */
+                for (i = 0; i < spec->autocfg.line_outs; i++)
+                        snd_hda_codec_amp_stereo(
+                                codec, spec->autocfg.line_out_pins[i],
+                                HDA_OUTPUT, 0,
+                                HDA_AMP_MUTE, hp_present ? HDA_AMP_MUTE : 0);
+                if (hp_present)
+                        present = hp_present;
+        }
+        /* Speakers */
+        for (i = 0; i < spec->autocfg.speaker_outs; i++)
+                snd_hda_codec_amp_stereo(
+                        codec, spec->autocfg.speaker_pins[i], HDA_OUTPUT, 0,
+                        HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+}
+
+
 /* unsolicited event for jack sensing */
 static void via_unsol_event(struct hda_codec *codec,
                                   unsigned int res)
 {
         res >>= 26;
-        if (res == VIA_HP_EVENT)
+        if (res & VIA_HP_EVENT)
                 via_hp_automute(codec);
-        else if (res == VIA_GPIO_EVENT)
+        if (res & VIA_GPIO_EVENT)
                 via_gpio_control(codec);
+        if (res & VIA_JACK_EVENT)
+                set_jack_power_state(codec);
+        if (res & VIA_MONO_EVENT)
+                via_mono_automute(codec);
+        if (res & VIA_SPEAKER_EVENT)
+                via_speaker_automute(codec);
+        if (res & VIA_BIND_HP_EVENT)
+                via_hp_bind_automute(codec);
 }
 
 static int via_init(struct hda_codec *codec)
@@ -986,6 +2177,10 @@ static int via_init(struct hda_codec *codec)
         for (i = 0; i < spec->num_iverbs; i++)
                 snd_hda_sequence_write(codec, spec->init_verbs[i]);
 
+        spec->codec_type = get_codec_type(codec);
+        if (spec->codec_type == VT1708BCE)
+                spec->codec_type = VT1708S; /* VT1708BCE & VT1708S are almost
+                                               same */
         /* Lydia Add for EAPD enable */
         if (!spec->dig_in_nid) { /* No Digital In connection */
                 if (spec->dig_in_pin) {
@@ -1003,9 +2198,18 @@ static int via_init(struct hda_codec *codec)
         if (spec->slave_dig_outs[0])
                 codec->slave_dig_outs = spec->slave_dig_outs;
 
-        return 0;
+        return 0;
 }
 
+#ifdef SND_HDA_NEEDS_RESUME
+static int via_suspend(struct hda_codec *codec, pm_message_t state)
+{
+        struct via_spec *spec = codec->spec;
+        vt1708_stop_hp_work(spec);
+        return 0;
+}
+#endif
+
 #ifdef CONFIG_SND_HDA_POWER_SAVE
 static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid)
 {
@@ -1021,6 +2225,9 @@ static struct hda_codec_ops via_patch_ops = {
         .build_pcms = via_build_pcms,
         .init = via_init,
         .free = via_free,
+#ifdef SND_HDA_NEEDS_RESUME
+        .suspend = via_suspend,
+#endif
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         .check_power_status = via_check_power_status,
 #endif
@@ -1036,8 +2243,8 @@ static int vt1708_auto_fill_dac_nids(struct via_spec *spec,
         spec->multiout.num_dacs = cfg->line_outs;
 
         spec->multiout.dac_nids = spec->private_dac_nids;
-        
-        for(i = 0; i < 4; i++) {
+
+        for (i = 0; i < 4; i++) {
                 nid = cfg->line_out_pins[i];
                 if (nid) {
                         /* config dac list */
@@ -1067,7 +2274,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
 {
         char name[32];
         static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
-        hda_nid_t nid, nid_vol = 0;
+        hda_nid_t nid, nid_vol, nid_vols[] = {0x17, 0x19, 0x1a, 0x1b};
         int i, err;
 
         for (i = 0; i <= AUTO_SEQ_SIDE; i++) {
@@ -1075,9 +2282,8 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
 
                 if (!nid)
                         continue;
-                
-                if (i != AUTO_SEQ_FRONT)
-                        nid_vol = 0x18 + i;
+
+                nid_vol = nid_vols[i];
 
                 if (i == AUTO_SEQ_CENLFE) {
                         /* Center/LFE */
@@ -1105,21 +2311,21 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
                                                                   HDA_OUTPUT));
                         if (err < 0)
                                 return err;
-                } else if (i == AUTO_SEQ_FRONT){
+                } 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_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(0x17, 3, 0,
+                                              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,
@@ -1178,6 +2384,7 @@ static int vt1708_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
                 return 0;
 
         spec->multiout.hp_nid = VT1708_HP_NID; /* AOW3 */
+        spec->hp_independent_mode_index = 1;
 
         err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
                               "Headphone Playback Volume",
@@ -1218,7 +2425,7 @@ static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec,
                 case 0x1d: /* Mic */
                         idx = 2;
                         break;
-                                
+
                 case 0x1e: /* Line In */
                         idx = 3;
                         break;
@@ -1231,8 +2438,7 @@ static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec,
                         idx = 1;
                         break;
                 }
-                err = via_new_analog_input(spec, cfg->input_pins[i], labels[i],
-                                           idx, 0x17);
+                err = via_new_analog_input(spec, labels[i], idx, 0x17);
                 if (err < 0)
                         return err;
                 imux->items[imux->num_items].label = labels[i];
@@ -1260,16 +2466,60 @@ static void vt1708_set_pinconfig_connect(struct hda_codec *codec, hda_nid_t nid)
         def_conf = snd_hda_codec_get_pincfg(codec, nid);
         seqassoc = (unsigned char) get_defcfg_association(def_conf);
         seqassoc = (seqassoc << 4) | get_defcfg_sequence(def_conf);
-        if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE) {
-                if (seqassoc == 0xff) {
-                        def_conf = def_conf & (~(AC_JACK_PORT_BOTH << 30));
-                        snd_hda_codec_set_pincfg(codec, nid, def_conf);
-                }
+        if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE
+            && (seqassoc == 0xf0 || seqassoc == 0xff)) {
+                def_conf = def_conf & (~(AC_JACK_PORT_BOTH << 30));
+                snd_hda_codec_set_pincfg(codec, nid, def_conf);
         }
 
         return;
 }
 
+static int vt1708_jack_detectect_get(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct via_spec *spec = codec->spec;
+
+        if (spec->codec_type != VT1708)
+                return 0;
+        spec->vt1708_jack_detectect =
+                !((snd_hda_codec_read(codec, 0x1, 0, 0xf84, 0) >> 8) & 0x1);
+        ucontrol->value.integer.value[0] = spec->vt1708_jack_detectect;
+        return 0;
+}
+
+static int vt1708_jack_detectect_put(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct via_spec *spec = codec->spec;
+        int change;
+
+        if (spec->codec_type != VT1708)
+                return 0;
+        spec->vt1708_jack_detectect = ucontrol->value.integer.value[0];
+        change = (0x1 & (snd_hda_codec_read(codec, 0x1, 0, 0xf84, 0) >> 8))
+                == !spec->vt1708_jack_detectect;
+        if (spec->vt1708_jack_detectect) {
+                mute_aa_path(codec, 1);
+                notify_aa_path_ctls(codec);
+        }
+        return change;
+}
+
+static struct snd_kcontrol_new vt1708_jack_detectect[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Jack Detect",
+                .count = 1,
+                .info = snd_ctl_boolean_mono_info,
+                .get = vt1708_jack_detectect_get,
+                .put = vt1708_jack_detectect_put,
+        },
+        {} /* end */
+};
+
 static int vt1708_parse_auto_config(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
@@ -1297,6 +2547,10 @@ static int vt1708_parse_auto_config(struct hda_codec *codec)
         err = vt1708_auto_create_analog_input_ctls(spec, &spec->autocfg);
         if (err < 0)
                 return err;
+        /* add jack detect on/off control */
+        err = snd_hda_add_new_ctls(codec, vt1708_jack_detectect);
+        if (err < 0)
+                return err;
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
@@ -1314,21 +2568,46 @@ static int vt1708_parse_auto_config(struct hda_codec *codec)
         spec->input_mux = &spec->private_imux[0];
 
         if (spec->hp_mux)
-                spec->mixers[spec->num_mixers++] = via_hp_mixer;
+                via_hp_build(codec);
 
+        via_smart51_build(spec);
         return 1;
 }
 
 /* init callback for auto-configuration model -- overriding the default init */
 static int via_auto_init(struct hda_codec *codec)
 {
+        struct via_spec *spec = codec->spec;
+
         via_init(codec);
         via_auto_init_multi_out(codec);
         via_auto_init_hp_out(codec);
         via_auto_init_analog_input(codec);
+        if (spec->codec_type == VT2002P || spec->codec_type == VT1812) {
+                via_hp_bind_automute(codec);
+        } else {
+                via_hp_automute(codec);
+                via_speaker_automute(codec);
+        }
+
         return 0;
 }
 
+static void vt1708_update_hp_jack_state(struct work_struct *work)
+{
+        struct via_spec *spec = container_of(work, struct via_spec,
+                                             vt1708_hp_work.work);
+        if (spec->codec_type != VT1708)
+                return;
+        /* if jack state toggled */
+        if (spec->vt1708_hp_present
+            != snd_hda_jack_detect(spec->codec, spec->autocfg.hp_pins[0])) {
+                spec->vt1708_hp_present ^= 1;
+                via_hp_automute(spec->codec);
+        }
+        vt1708_start_hp_work(spec);
+}
+
 static int get_mux_nids(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
@@ -1362,12 +2641,10 @@ static int patch_vt1708(struct hda_codec *codec)
         int err;
 
         /* create a codec specific record */
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        spec = via_new_spec(codec);
         if (spec == NULL)
                 return -ENOMEM;
 
-        codec->spec = spec;
-
         /* automatic parse from the BIOS config */
         err = vt1708_parse_auto_config(codec);
         if (err < 0) {
@@ -1378,7 +2655,7 @@ static int patch_vt1708(struct hda_codec *codec)
                        "from BIOS.  Using genenic mode...\n");
         }
 
-        
+
         spec->stream_name_analog = "VT1708 Analog";
         spec->stream_analog_playback = &vt1708_pcm_analog_playback;
         /* disable 32bit format on VT1708 */
@@ -1390,7 +2667,7 @@ static int patch_vt1708(struct hda_codec *codec)
         spec->stream_digital_playback = &vt1708_pcm_digital_playback;
         spec->stream_digital_capture = &vt1708_pcm_digital_capture;
 
-        
+
         if (!spec->adc_nids && spec->input_mux) {
                 spec->adc_nids = vt1708_adc_nids;
                 spec->num_adc_nids = ARRAY_SIZE(vt1708_adc_nids);
@@ -1405,7 +2682,7 @@ static int patch_vt1708(struct hda_codec *codec)
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         spec->loopback.amplist = vt1708_loopbacks;
 #endif
-
+        INIT_DELAYED_WORK(&spec->vt1708_hp_work, vt1708_update_hp_jack_state);
         return 0;
 }
 
@@ -1433,7 +2710,8 @@ static struct snd_kcontrol_new vt1709_capture_mixer[] = {
 };
 
 static struct hda_verb vt1709_uniwill_init_verbs[] = {
-        {0x20, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_HP_EVENT},
+        {0x20, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
         { }
 };
 
@@ -1473,8 +2751,8 @@ static struct hda_verb vt1709_10ch_volume_init_verbs[] = {
         {0x1f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
 
-        /* Set input of PW4 as AOW4 */
-        {0x20, AC_VERB_SET_CONNECT_SEL, 0x1},
+        /* Set input of PW4 as MW0 */
+        {0x20, AC_VERB_SET_CONNECT_SEL, 0},
         /* PW9 Output enable */
         {0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
         { }
@@ -1487,8 +2765,8 @@ static struct hda_pcm_stream vt1709_10ch_pcm_analog_playback = {
         .nid = 0x10, /* NID to query formats and rates */
         .ops = {
                 .open = via_playback_pcm_open,
-                .prepare = via_playback_pcm_prepare,
-                .cleanup = via_playback_pcm_cleanup
+                .prepare = via_playback_multi_pcm_prepare,
+                .cleanup = via_playback_multi_pcm_cleanup,
         },
 };
 
@@ -1499,8 +2777,8 @@ static struct hda_pcm_stream vt1709_6ch_pcm_analog_playback = {
         .nid = 0x10, /* NID to query formats and rates */
         .ops = {
                 .open = via_playback_pcm_open,
-                .prepare = via_playback_pcm_prepare,
-                .cleanup = via_playback_pcm_cleanup
+                .prepare = via_playback_multi_pcm_prepare,
+                .cleanup = via_playback_multi_pcm_cleanup,
         },
 };
 
@@ -1575,11 +2853,11 @@ static int vt1709_auto_fill_dac_nids(struct via_spec *spec,
                 spec->multiout.dac_nids[cfg->line_outs] = 0x28; /* AOW4 */
 
         } else if (cfg->line_outs == 3) { /* 6 channels */
-                for(i = 0; i < cfg->line_outs; i++) {
+                for (i = 0; i < cfg->line_outs; i++) {
                         nid = cfg->line_out_pins[i];
                         if (nid) {
                                 /* config dac list */
-                                switch(i) {
+                                switch (i) {
                                 case AUTO_SEQ_FRONT:
                                         /* AOW0 */
                                         spec->multiout.dac_nids[i] = 0x10;
@@ -1608,56 +2886,58 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
 {
         char name[32];
         static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
-        hda_nid_t nid = 0;
+        hda_nid_t nid, nid_vol, nid_vols[] = {0x18, 0x1a, 0x1b, 0x29};
         int i, err;
 
         for (i = 0; i <= AUTO_SEQ_SIDE; i++) {
                 nid = cfg->line_out_pins[i];
 
-                if (!nid)       
+                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(0x1b, 1, 0,
+                                              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(0x1b, 2, 0,
+                                              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(0x1b, 1, 0,
+                                              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(0x1b, 2, 0,
+                                              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 */
+                } 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_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(0x18, 3, 0,
+                                              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,
@@ -1674,26 +2954,26 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
                 } 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(0x1a, 3, 0,
+                                              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(0x1a, 3, 0,
+                                              HDA_COMPOSE_AMP_VAL(nid_vol, 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(0x29, 3, 0,
+                                              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(0x29, 3, 0,
+                                              HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
                                                                   HDA_OUTPUT));
                         if (err < 0)
                                 return err;
@@ -1714,6 +2994,7 @@ static int vt1709_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
                 spec->multiout.hp_nid = VT1709_HP_DAC_NID;
         else if (spec->multiout.num_dacs == 3) /* 6 channels */
                 spec->multiout.hp_nid = 0;
+        spec->hp_independent_mode_index = 1;
 
         err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
                               "Headphone Playback Volume",
@@ -1752,7 +3033,7 @@ static int vt1709_auto_create_analog_input_ctls(struct via_spec *spec,
                 case 0x1d: /* Mic */
                         idx = 2;
                         break;
-                                
+
                 case 0x1e: /* Line In */
                         idx = 3;
                         break;
@@ -1765,8 +3046,7 @@ static int vt1709_auto_create_analog_input_ctls(struct via_spec *spec,
                         idx = 1;
                         break;
                 }
-                err = via_new_analog_input(spec, cfg->input_pins[i], labels[i],
-                                           idx, 0x18);
+                err = via_new_analog_input(spec, labels[i], idx, 0x18);
                 if (err < 0)
                         return err;
                 imux->items[imux->num_items].label = labels[i];
@@ -1814,8 +3094,9 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)
         spec->input_mux = &spec->private_imux[0];
 
         if (spec->hp_mux)
-                spec->mixers[spec->num_mixers++] = via_hp_mixer;
+                via_hp_build(codec);
 
+        via_smart51_build(spec);
         return 1;
 }
 
@@ -1835,12 +3116,10 @@ static int patch_vt1709_10ch(struct hda_codec *codec)
         int err;
 
         /* create a codec specific record */
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        spec = via_new_spec(codec);
         if (spec == NULL)
                 return -ENOMEM;
 
-        codec->spec = spec;
-
         err = vt1709_parse_auto_config(codec);
         if (err < 0) {
                 via_free(codec);
@@ -1861,7 +3140,7 @@ static int patch_vt1709_10ch(struct hda_codec *codec)
         spec->stream_digital_playback = &vt1709_pcm_digital_playback;
         spec->stream_digital_capture = &vt1709_pcm_digital_capture;
 
-        
+
         if (!spec->adc_nids && spec->input_mux) {
                 spec->adc_nids = vt1709_adc_nids;
                 spec->num_adc_nids = ARRAY_SIZE(vt1709_adc_nids);
@@ -1929,12 +3208,10 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
         int err;
 
         /* create a codec specific record */
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        spec = via_new_spec(codec);
         if (spec == NULL)
                 return -ENOMEM;
 
-        codec->spec = spec;
-
         err = vt1709_parse_auto_config(codec);
         if (err < 0) {
                 via_free(codec);
@@ -1955,7 +3232,7 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
         spec->stream_digital_playback = &vt1709_pcm_digital_playback;
         spec->stream_digital_capture = &vt1709_pcm_digital_capture;
 
-        
+
         if (!spec->adc_nids && spec->input_mux) {
                 spec->adc_nids = vt1709_adc_nids;
                 spec->num_adc_nids = ARRAY_SIZE(vt1709_adc_nids);
@@ -2024,7 +3301,7 @@ static struct hda_verb vt1708B_8ch_volume_init_verbs[] = {
         {0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
 
         /* Setup default input to PW4 */
-        {0x1d, AC_VERB_SET_CONNECT_SEL, 0x1},
+        {0x1d, AC_VERB_SET_CONNECT_SEL, 0},
         /* PW9 Output enable */
         {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
         /* PW10 Input enable */
@@ -2068,10 +3345,29 @@ static struct hda_verb vt1708B_4ch_volume_init_verbs[] = {
 };
 
 static struct hda_verb vt1708B_uniwill_init_verbs[] = {
-        {0x1D, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_HP_EVENT},
+        {0x1d, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
+        {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1e, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x22, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x23, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
         { }
 };
 
+static int via_pcm_open_close(struct hda_pcm_stream *hinfo,
+                              struct hda_codec *codec,
+                              struct snd_pcm_substream *substream)
+{
+        int idle = substream->pstr->substream_opened == 1
+                && substream->ref_count == 0;
+
+        analog_low_current_mode(codec, idle);
+        return 0;
+}
+
 static struct hda_pcm_stream vt1708B_8ch_pcm_analog_playback = {
         .substreams = 2,
         .channels_min = 2,
@@ -2080,7 +3376,8 @@ static struct hda_pcm_stream vt1708B_8ch_pcm_analog_playback = {
         .ops = {
                 .open = via_playback_pcm_open,
                 .prepare = via_playback_multi_pcm_prepare,
-                .cleanup = via_playback_multi_pcm_cleanup
+                .cleanup = via_playback_multi_pcm_cleanup,
+                .close = via_pcm_open_close
         },
 };
 
@@ -2102,8 +3399,10 @@ static struct hda_pcm_stream vt1708B_pcm_analog_capture = {
         .channels_max = 2,
         .nid = 0x13, /* NID to query formats and rates */
         .ops = {
+                .open = via_pcm_open_close,
                 .prepare = via_capture_pcm_prepare,
-                .cleanup = via_capture_pcm_cleanup
+                .cleanup = via_capture_pcm_cleanup,
+                .close = via_pcm_open_close
         },
 };
 
@@ -2260,6 +3559,7 @@ static int vt1708B_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
                 return 0;
 
         spec->multiout.hp_nid = VT1708B_HP_NID; /* AOW3 */
+        spec->hp_independent_mode_index = 1;
 
         err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
                               "Headphone Playback Volume",
@@ -2313,8 +3613,7 @@ static int vt1708B_auto_create_analog_input_ctls(struct via_spec *spec,
                         idx = 1;
                         break;
                 }
-                err = via_new_analog_input(spec, cfg->input_pins[i], labels[i],
-                                           idx, 0x16);
+                err = via_new_analog_input(spec, labels[i], idx, 0x16);
                 if (err < 0)
                         return err;
                 imux->items[imux->num_items].label = labels[i];
@@ -2362,8 +3661,9 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec)
         spec->input_mux = &spec->private_imux[0];
 
         if (spec->hp_mux)
-                spec->mixers[spec->num_mixers++] = via_hp_mixer;
+                via_hp_build(codec);
 
+        via_smart51_build(spec);
         return 1;
 }
 
@@ -2376,19 +3676,19 @@ static struct hda_amp_list vt1708B_loopbacks[] = {
         { } /* end */
 };
 #endif
-
+static int patch_vt1708S(struct hda_codec *codec);
 static int patch_vt1708B_8ch(struct hda_codec *codec)
 {
         struct via_spec *spec;
         int err;
 
+        if (get_codec_type(codec) == VT1708BCE)
+                return patch_vt1708S(codec);
         /* create a codec specific record */
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        spec = via_new_spec(codec);
         if (spec == NULL)
                 return -ENOMEM;
 
-        codec->spec = spec;
-
         /* automatic parse from the BIOS config */
         err = vt1708B_parse_auto_config(codec);
         if (err < 0) {
@@ -2435,12 +3735,10 @@ static int patch_vt1708B_4ch(struct hda_codec *codec)
         int err;
 
         /* create a codec specific record */
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        spec = via_new_spec(codec);
         if (spec == NULL)
                 return -ENOMEM;
 
-        codec->spec = spec;
-
         /* automatic parse from the BIOS config */
         err = vt1708B_parse_auto_config(codec);
         if (err < 0) {
@@ -2483,29 +3781,15 @@ static int patch_vt1708B_4ch(struct hda_codec *codec)
 
 /* Patch for VT1708S */
 
-/* VT1708S software backdoor based override for buggy hardware micboost
- * setting */
-#define MIC_BOOST_VOLUME(xname, nid) {                          \
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,            \
-        .name = xname,                                  \
-        .index = 0,                                     \
-        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |     \
-        SNDRV_CTL_ELEM_ACCESS_TLV_READ |                \
-        SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK,             \
-        .info = mic_boost_volume_info,                  \
-        .get = snd_hda_mixer_amp_volume_get,            \
-        .put = snd_hda_mixer_amp_volume_put,            \
-        .tlv = { .c = mic_boost_tlv },                  \
-        .private_value = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT) }
-
 /* capture mixer elements */
 static struct snd_kcontrol_new vt1708S_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),
-        MIC_BOOST_VOLUME("Mic Boost Capture Volume", 0x1A),
-        MIC_BOOST_VOLUME("Front Mic Boost Capture Volume", 0x1E),
+        HDA_CODEC_VOLUME("Mic Boost Capture Volume", 0x1A, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Capture Volume", 0x1E, 0x0,
+                         HDA_INPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 /* The multiple "Capture Source" controls confuse alsamixer
@@ -2542,11 +3826,21 @@ static struct hda_verb vt1708S_volume_init_verbs[] = {
         {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
         /* Enable Mic Boost Volume backdoor */
         {0x1, 0xf98, 0x1},
+        /* don't bybass mixer */
+        {0x1, 0xf88, 0xc0},
         { }
 };
 
 static struct hda_verb vt1708S_uniwill_init_verbs[] = {
-        {0x1D, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_HP_EVENT},
+        {0x1d, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
+        {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1e, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x22, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x23, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
         { }
 };
 
@@ -2557,8 +3851,9 @@ static struct hda_pcm_stream vt1708S_pcm_analog_playback = {
         .nid = 0x10, /* NID to query formats and rates */
         .ops = {
                 .open = via_playback_pcm_open,
-                .prepare = via_playback_pcm_prepare,
-                .cleanup = via_playback_pcm_cleanup
+                .prepare = via_playback_multi_pcm_prepare,
+                .cleanup = via_playback_multi_pcm_cleanup,
+                .close = via_pcm_open_close
         },
 };
 
@@ -2568,8 +3863,10 @@ static struct hda_pcm_stream vt1708S_pcm_analog_capture = {
         .channels_max = 2,
         .nid = 0x13, /* NID to query formats and rates */
         .ops = {
+                .open = via_pcm_open_close,
                 .prepare = via_capture_pcm_prepare,
-                .cleanup = via_capture_pcm_cleanup
+                .cleanup = via_capture_pcm_cleanup,
+                .close = via_pcm_open_close
         },
 };
 
@@ -2726,6 +4023,7 @@ static int vt1708S_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
                 return 0;
 
         spec->multiout.hp_nid = VT1708S_HP_NID; /* AOW3 */
+        spec->hp_independent_mode_index = 1;
 
         err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
                               "Headphone Playback Volume",
@@ -2780,8 +4078,7 @@ static int vt1708S_auto_create_analog_input_ctls(struct via_spec *spec,
                         idx = 1;
                         break;
                 }
-                err = via_new_analog_input(spec, cfg->input_pins[i], labels[i],
-                                           idx, 0x16);
+                err = via_new_analog_input(spec, labels[i], idx, 0x16);
                 if (err < 0)
                         return err;
                 imux->items[imux->num_items].label = labels[i];
@@ -2850,8 +4147,9 @@ static int vt1708S_parse_auto_config(struct hda_codec *codec)
         spec->input_mux = &spec->private_imux[0];
 
         if (spec->hp_mux)
-                spec->mixers[spec->num_mixers++] = via_hp_mixer;
+                via_hp_build(codec);
 
+        via_smart51_build(spec);
         return 1;
 }
 
@@ -2865,18 +4163,26 @@ static struct hda_amp_list vt1708S_loopbacks[] = {
 };
 #endif
 
+static void override_mic_boost(struct hda_codec *codec, hda_nid_t pin,
+                               int offset, int num_steps, int step_size)
+{
+        snd_hda_override_amp_caps(codec, pin, HDA_INPUT,
+                                  (offset << AC_AMPCAP_OFFSET_SHIFT) |
+                                  (num_steps << AC_AMPCAP_NUM_STEPS_SHIFT) |
+                                  (step_size << AC_AMPCAP_STEP_SIZE_SHIFT) |
+                                  (0 << AC_AMPCAP_MUTE_SHIFT));
+}
+
 static int patch_vt1708S(struct hda_codec *codec)
 {
         struct via_spec *spec;
         int err;
 
         /* create a codec specific record */
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        spec = via_new_spec(codec);
         if (spec == NULL)
                 return -ENOMEM;
 
-        codec->spec = spec;
-
         /* automatic parse from the BIOS config */
         err = vt1708S_parse_auto_config(codec);
         if (err < 0) {
@@ -2890,17 +4196,25 @@ static int patch_vt1708S(struct hda_codec *codec)
         spec->init_verbs[spec->num_iverbs++] = vt1708S_volume_init_verbs;
         spec->init_verbs[spec->num_iverbs++] = vt1708S_uniwill_init_verbs;
 
-        spec->stream_name_analog = "VT1708S Analog";
+        if (codec->vendor_id == 0x11060440)
+                spec->stream_name_analog = "VT1818S Analog";
+        else
+                spec->stream_name_analog = "VT1708S Analog";
         spec->stream_analog_playback = &vt1708S_pcm_analog_playback;
         spec->stream_analog_capture = &vt1708S_pcm_analog_capture;
 
-        spec->stream_name_digital = "VT1708S Digital";
+        if (codec->vendor_id == 0x11060440)
+                spec->stream_name_digital = "VT1818S Digital";
+        else
+                spec->stream_name_digital = "VT1708S Digital";
         spec->stream_digital_playback = &vt1708S_pcm_digital_playback;
 
         if (!spec->adc_nids && spec->input_mux) {
                 spec->adc_nids = vt1708S_adc_nids;
                 spec->num_adc_nids = ARRAY_SIZE(vt1708S_adc_nids);
                 get_mux_nids(codec);
+                override_mic_boost(codec, 0x1a, 0, 3, 40);
+                override_mic_boost(codec, 0x1e, 0, 3, 40);
                 spec->mixers[spec->num_mixers] = vt1708S_capture_mixer;
                 spec->num_mixers++;
         }
@@ -2913,6 +4227,16 @@ static int patch_vt1708S(struct hda_codec *codec)
         spec->loopback.amplist = vt1708S_loopbacks;
 #endif
 
+        /* correct names for VT1708BCE */
+        if (get_codec_type(codec) == VT1708BCE) {
+                kfree(codec->chip_name);
+                codec->chip_name = kstrdup("VT1708BCE", GFP_KERNEL);
+                snprintf(codec->bus->card->mixername,
+                         sizeof(codec->bus->card->mixername),
+                         "%s %s", codec->vendor_name, codec->chip_name);
+                spec->stream_name_analog = "VT1708BCE Analog";
+                spec->stream_name_digital = "VT1708BCE Digital";
+        }
         return 0;
 }
 
@@ -2967,12 +4291,20 @@ static struct hda_verb vt1702_volume_init_verbs[] = {
         /* PW6 PW7 Output enable */
         {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
         {0x1C, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        /* mixer enable */
+        {0x1, 0xF88, 0x3},
+        /* GPIO 0~2 */
+        {0x1, 0xF82, 0x3F},
         { }
 };
 
 static struct hda_verb vt1702_uniwill_init_verbs[] = {
-        {0x01, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_GPIO_EVENT},
-        {0x17, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_HP_EVENT},
+        {0x17, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
+        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x16, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
         { }
 };
 
@@ -2984,7 +4316,8 @@ static struct hda_pcm_stream vt1702_pcm_analog_playback = {
         .ops = {
                 .open = via_playback_pcm_open,
                 .prepare = via_playback_multi_pcm_prepare,
-                .cleanup = via_playback_multi_pcm_cleanup
+                .cleanup = via_playback_multi_pcm_cleanup,
+                .close = via_pcm_open_close
         },
 };
 
@@ -2994,8 +4327,10 @@ static struct hda_pcm_stream vt1702_pcm_analog_capture = {
         .channels_max = 2,
         .nid = 0x12, /* NID to query formats and rates */
         .ops = {
+                .open = via_pcm_open_close,
                 .prepare = via_capture_pcm_prepare,
-                .cleanup = via_capture_pcm_cleanup
+                .cleanup = via_capture_pcm_cleanup,
+                .close = via_pcm_open_close
         },
 };
 
@@ -3065,12 +4400,13 @@ static int vt1702_auto_create_line_out_ctls(struct via_spec *spec,
 
 static int vt1702_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
 {
-        int err;
-
+        int err, i;
+        struct hda_input_mux *imux;
+        static const char *texts[] = { "ON", "OFF", NULL};
         if (!pin)
                 return 0;
-
         spec->multiout.hp_nid = 0x1D;
+        spec->hp_independent_mode_index = 0;
 
         err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
                               "Headphone Playback Volume",
@@ -3084,8 +4420,18 @@ static int vt1702_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
         if (err < 0)
                 return err;
 
-        create_hp_imux(spec);
+        imux = &spec->private_imux[1];
+
+        /* for hp mode select */
+        i = 0;
+        while (texts[i] != NULL)        {
+                imux->items[imux->num_items].label =  texts[i];
+                imux->items[imux->num_items].index = i;
+                imux->num_items++;
+                i++;
+        }
 
+        spec->hp_mux = &spec->private_imux[1];
         return 0;
 }
 
@@ -3121,8 +4467,7 @@ static int vt1702_auto_create_analog_input_ctls(struct via_spec *spec,
                         idx = 3;
                         break;
                 }
-                err = via_new_analog_input(spec, cfg->input_pins[i],
-                                           labels[i], idx, 0x1A);
+                err = via_new_analog_input(spec, labels[i], idx, 0x1A);
                 if (err < 0)
                         return err;
                 imux->items[imux->num_items].label = labels[i];
@@ -3152,6 +4497,12 @@ static int vt1702_parse_auto_config(struct hda_codec *codec)
         err = vt1702_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
         if (err < 0)
                 return err;
+        /* limit AA path volume to 0 dB */
+        snd_hda_override_amp_caps(codec, 0x1A, HDA_INPUT,
+                                  (0x17 << AC_AMPCAP_OFFSET_SHIFT) |
+                                  (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |
+                                  (0x5 << AC_AMPCAP_STEP_SIZE_SHIFT) |
+                                  (1 << AC_AMPCAP_MUTE_SHIFT));
         err = vt1702_auto_create_analog_input_ctls(spec, &spec->autocfg);
         if (err < 0)
                 return err;
@@ -3166,7 +4517,7 @@ static int vt1702_parse_auto_config(struct hda_codec *codec)
         spec->input_mux = &spec->private_imux[0];
 
         if (spec->hp_mux)
-                spec->mixers[spec->num_mixers++] = via_hp_mixer;
+                via_hp_build(codec);
 
         return 1;
 }
@@ -3185,16 +4536,12 @@ static int patch_vt1702(struct hda_codec *codec)
 {
         struct via_spec *spec;
         int err;
-        unsigned int response;
-        unsigned char control;
 
         /* create a codec specific record */
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        spec = via_new_spec(codec);
         if (spec == NULL)
                 return -ENOMEM;
 
-        codec->spec = spec;
-
         /* automatic parse from the BIOS config */
         err = vt1702_parse_auto_config(codec);
         if (err < 0) {
@@ -3231,17 +4578,1631 @@ static int patch_vt1702(struct hda_codec *codec)
         spec->loopback.amplist = vt1702_loopbacks;
 #endif
 
-        /* Open backdoor */
-        response = snd_hda_codec_read(codec, codec->afg, 0, 0xF8C, 0);
-        control = (unsigned char)(response & 0xff);
-        control |= 0x3;
-        snd_hda_codec_write(codec,  codec->afg, 0, 0xF88, control);
+        return 0;
+}
+
+/* Patch for VT1718S */
+
+/* capture mixer elements */
+static struct snd_kcontrol_new vt1718S_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x10, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x10, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x11, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x11, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Capture Volume", 0x2b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Capture Volume", 0x29, 0x0,
+                         HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                /* The multiple "Capture Source" controls confuse alsamixer
+                 * So call somewhat different..
+                 */
+                .name = "Input Source",
+                .count = 2,
+                .info = via_mux_enum_info,
+                .get = via_mux_enum_get,
+                .put = via_mux_enum_put,
+        },
+        { } /* end */
+};
+
+static struct hda_verb vt1718S_volume_init_verbs[] = {
+        /*
+         * Unmute ADC0-1 and set the default input to mic-in
+         */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+
+        /* Mute 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 */
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
+
+        /* Setup default input of Front HP to MW9 */
+        {0x28, AC_VERB_SET_CONNECT_SEL, 0x1},
+        /* PW9 PW10 Output enable */
+        {0x2d, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},
+        {0x2e, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},
+        /* PW11 Input enable */
+        {0x2f, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_IN_EN},
+        /* Enable Boost Volume backdoor */
+        {0x1, 0xf88, 0x8},
+        /* MW0/1/2/3/4: un-mute index 0 (AOWx), mute index 1 (MW9) */
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* set MUX1 = 2 (AOW4), MUX2 = 1 (AOW3) */
+        {0x34, AC_VERB_SET_CONNECT_SEL, 0x2},
+        {0x35, AC_VERB_SET_CONNECT_SEL, 0x1},
+        /* Unmute MW4's index 0 */
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        { }
+};
+
+
+static struct hda_verb vt1718S_uniwill_init_verbs[] = {
+        {0x28, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
+        {0x24, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x25, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x26, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x27, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x29, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x2a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x2b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        { }
+};
+
+static struct hda_pcm_stream vt1718S_pcm_analog_playback = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 10,
+        .nid = 0x8, /* NID to query formats and rates */
+        .ops = {
+                .open = via_playback_pcm_open,
+                .prepare = via_playback_multi_pcm_prepare,
+                .cleanup = via_playback_multi_pcm_cleanup,
+                .close = via_pcm_open_close,
+        },
+};
+
+static struct hda_pcm_stream vt1718S_pcm_analog_capture = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0x10, /* NID to query formats and rates */
+        .ops = {
+                .open = via_pcm_open_close,
+                .prepare = via_capture_pcm_prepare,
+                .cleanup = via_capture_pcm_cleanup,
+                .close = via_pcm_open_close,
+        },
+};
+
+static struct hda_pcm_stream vt1718S_pcm_digital_playback = {
+        .substreams = 2,
+        .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,
+                .cleanup = via_dig_playback_pcm_cleanup
+        },
+};
+
+static struct hda_pcm_stream vt1718S_pcm_digital_capture = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+};
+
+/* fill in the dac_nids table from the parsed pin configuration */
+static int vt1718S_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] = 0x8;
+                                break;
+                        case AUTO_SEQ_CENLFE:
+                                spec->multiout.dac_nids[i] = 0xa;
+                                break;
+                        case AUTO_SEQ_SURROUND:
+                                spec->multiout.dac_nids[i] = 0x9;
+                                break;
+                        case AUTO_SEQ_SIDE:
+                                spec->multiout.dac_nids[i] = 0xb;
+                                break;
+                        }
+                }
+        }
+
+        return 0;
+}
+
+/* add playback controls from the parsed DAC table */
+static int vt1718S_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[] = {0x8, 0x9, 0xa, 0xb};
+        hda_nid_t nid_mutes[] = {0x24, 0x25, 0x26, 0x27};
+        hda_nid_t nid, nid_vol, nid_mute = 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];
+                nid_mute = nid_mutes[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_mute, 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_mute, 2, 0,
+                                                    HDA_OUTPUT));
+                        if (err < 0)
+                                return err;
+                } else if (i == AUTO_SEQ_FRONT) {
+                        /* Front */
+                        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_mute, 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_mute, 3, 0,
+                                                    HDA_OUTPUT));
+                        if (err < 0)
+                                return err;
+                }
+        }
+        return 0;
+}
+
+static int vt1718S_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
+{
+        int err;
+
+        if (!pin)
+                return 0;
+
+        spec->multiout.hp_nid = 0xc; /* AOW4 */
+        spec->hp_independent_mode_index = 1;
+
+        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                              "Headphone Playback Volume",
+                              HDA_COMPOSE_AMP_VAL(0xc, 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;
+
+        create_hp_imux(spec);
+        return 0;
+}
+
+/* create playback/capture controls for input pins */
+static int vt1718S_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[0];
+        int i, err, idx = 0;
+
+        /* for internal loopback recording select */
+        imux->items[imux->num_items].label = "Stereo Mixer";
+        imux->items[imux->num_items].index = 5;
+        imux->num_items++;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                if (!cfg->input_pins[i])
+                        continue;
+
+                switch (cfg->input_pins[i]) {
+                case 0x2b: /* Mic */
+                        idx = 1;
+                        break;
+
+                case 0x2a: /* Line In */
+                        idx = 2;
+                        break;
+
+                case 0x29: /* Front Mic */
+                        idx = 3;
+                        break;
+
+                case 0x2c: /* CD */
+                        idx = 0;
+                        break;
+                }
+                err = via_new_analog_input(spec, labels[i], idx, 0x21);
+                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 vt1718S_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 = vt1718S_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 = vt1718S_auto_create_multi_out_ctls(spec, &spec->autocfg);
+        if (err < 0)
+                return err;
+        err = vt1718S_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
+        if (err < 0)
+                return err;
+        err = vt1718S_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        if (err < 0)
+                return err;
+
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+        fill_dig_outs(codec);
+
+        if (spec->autocfg.dig_in_pin && codec->vendor_id == 0x11060428)
+                spec->dig_in_nid = 0x13;
+
+        if (spec->kctls.list)
+                spec->mixers[spec->num_mixers++] = spec->kctls.list;
+
+        spec->input_mux = &spec->private_imux[0];
+
+        if (spec->hp_mux)
+                via_hp_build(codec);
+
+        via_smart51_build(spec);
+
+        return 1;
+}
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list vt1718S_loopbacks[] = {
+        { 0x21, HDA_INPUT, 1 },
+        { 0x21, HDA_INPUT, 2 },
+        { 0x21, HDA_INPUT, 3 },
+        { 0x21, HDA_INPUT, 4 },
+        { } /* end */
+};
+#endif
+
+static int patch_vt1718S(struct hda_codec *codec)
+{
+        struct via_spec *spec;
+        int err;
+
+        /* create a codec specific record */
+        spec = via_new_spec(codec);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        /* automatic parse from the BIOS config */
+        err = vt1718S_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[spec->num_iverbs++] = vt1718S_volume_init_verbs;
+        spec->init_verbs[spec->num_iverbs++] = vt1718S_uniwill_init_verbs;
+
+        if (codec->vendor_id == 0x11060441)
+                spec->stream_name_analog = "VT2020 Analog";
+        else if (codec->vendor_id == 0x11064441)
+                spec->stream_name_analog = "VT1828S Analog";
+        else
+                spec->stream_name_analog = "VT1718S Analog";
+        spec->stream_analog_playback = &vt1718S_pcm_analog_playback;
+        spec->stream_analog_capture = &vt1718S_pcm_analog_capture;
+
+        if (codec->vendor_id == 0x11060441)
+                spec->stream_name_digital = "VT2020 Digital";
+        else if (codec->vendor_id == 0x11064441)
+                spec->stream_name_digital = "VT1828S Digital";
+        else
+                spec->stream_name_digital = "VT1718S Digital";
+        spec->stream_digital_playback = &vt1718S_pcm_digital_playback;
+        if (codec->vendor_id == 0x11060428 || codec->vendor_id == 0x11060441)
+                spec->stream_digital_capture = &vt1718S_pcm_digital_capture;
+
+        if (!spec->adc_nids && spec->input_mux) {
+                spec->adc_nids = vt1718S_adc_nids;
+                spec->num_adc_nids = ARRAY_SIZE(vt1718S_adc_nids);
+                get_mux_nids(codec);
+                override_mic_boost(codec, 0x2b, 0, 3, 40);
+                override_mic_boost(codec, 0x29, 0, 3, 40);
+                spec->mixers[spec->num_mixers] = vt1718S_capture_mixer;
+                spec->num_mixers++;
+        }
+
+        codec->patch_ops = via_patch_ops;
+
+        codec->patch_ops.init = via_auto_init;
+        codec->patch_ops.unsol_event = via_unsol_event;
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = vt1718S_loopbacks;
+#endif
+
+        return 0;
+}
+
+/* Patch for VT1716S */
+
+static int vt1716s_dmic_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 vt1716s_dmic_get(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        int index = 0;
+
+        index = snd_hda_codec_read(codec, 0x26, 0,
+                                               AC_VERB_GET_CONNECT_SEL, 0);
+        if (index != -1)
+                *ucontrol->value.integer.value = index;
+
+        return 0;
+}
+
+static int vt1716s_dmic_put(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct via_spec *spec = codec->spec;
+        int index = *ucontrol->value.integer.value;
+
+        snd_hda_codec_write(codec, 0x26, 0,
+                                               AC_VERB_SET_CONNECT_SEL, index);
+        spec->dmic_enabled = index;
+        set_jack_power_state(codec);
+
+        return 1;
+}
+
+/* capture mixer elements */
+static struct snd_kcontrol_new vt1716S_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),
+        HDA_CODEC_VOLUME("Mic Boost Capture Volume", 0x1A, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Capture Volume", 0x1E, 0x0,
+                         HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input Source",
+                .count = 1,
+                .info = via_mux_enum_info,
+                .get = via_mux_enum_get,
+                .put = via_mux_enum_put,
+        },
+        { } /* end */
+};
+
+static struct snd_kcontrol_new vt1716s_dmic_mixer[] = {
+        HDA_CODEC_VOLUME("Digital Mic Capture Volume", 0x22, 0x0, HDA_INPUT),
+        {
+         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+         .name = "Digital Mic Capture Switch",
+         .subdevice = HDA_SUBDEV_NID_FLAG | 0x26,
+         .count = 1,
+         .info = vt1716s_dmic_info,
+         .get = vt1716s_dmic_get,
+         .put = vt1716s_dmic_put,
+         },
+        {}                      /* end */
+};
+
+
+/* mono-out mixer elements */
+static struct snd_kcontrol_new vt1716S_mono_out_mixer[] = {
+        HDA_CODEC_MUTE("Mono Playback Switch", 0x2a, 0x0, HDA_OUTPUT),
+        { } /* end */
+};
+
+static struct hda_verb vt1716S_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)},
+
+
+        /* Mute 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_MUTE(0)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+
+        /* MUX Indices: Stereo Mixer = 5 */
+        {0x17, AC_VERB_SET_CONNECT_SEL, 0x5},
+
+        /* Setup default input of PW4 to MW0 */
+        {0x1d, AC_VERB_SET_CONNECT_SEL, 0x0},
+
+        /* Setup default input of SW1 as MW0 */
+        {0x18, AC_VERB_SET_CONNECT_SEL, 0x1},
+
+        /* Setup default input of SW4 as AOW0 */
+        {0x28, AC_VERB_SET_CONNECT_SEL, 0x1},
+
+        /* PW9 PW10 Output enable */
+        {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+
+        /* Unmute SW1, PW12 */
+        {0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x2a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* PW12 Output enable */
+        {0x2a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        /* Enable Boost Volume backdoor */
+        {0x1, 0xf8a, 0x80},
+        /* don't bybass mixer */
+        {0x1, 0xf88, 0xc0},
+        /* Enable mono output */
+        {0x1, 0xf90, 0x08},
+        { }
+};
+
+
+static struct hda_verb vt1716S_uniwill_init_verbs[] = {
+        {0x1d, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
+        {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1c, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_MONO_EVENT | VIA_JACK_EVENT},
+        {0x1e, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x23, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        { }
+};
+
+static struct hda_pcm_stream vt1716S_pcm_analog_playback = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 6,
+        .nid = 0x10, /* NID to query formats and rates */
+        .ops = {
+                .open = via_playback_pcm_open,
+                .prepare = via_playback_multi_pcm_prepare,
+                .cleanup = via_playback_multi_pcm_cleanup,
+                .close = via_pcm_open_close,
+        },
+};
+
+static struct hda_pcm_stream vt1716S_pcm_analog_capture = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0x13, /* NID to query formats and rates */
+        .ops = {
+                .open = via_pcm_open_close,
+                .prepare = via_capture_pcm_prepare,
+                .cleanup = via_capture_pcm_cleanup,
+                .close = via_pcm_open_close,
+        },
+};
+
+static struct hda_pcm_stream vt1716S_pcm_digital_playback = {
+        .substreams = 2,
+        .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,
+                .cleanup = via_dig_playback_pcm_cleanup
+        },
+};
+
+/* fill in the dac_nids table from the parsed pin configuration */
+static int vt1716S_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 < 3; 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] = 0x25;
+                                break;
+                        case AUTO_SEQ_SURROUND:
+                                spec->multiout.dac_nids[i] = 0x11;
+                                break;
+                        }
+                }
+        }
+
+        return 0;
+}
+
+/* add playback controls from the parsed DAC table */
+static int vt1716S_auto_create_multi_out_ctls(struct via_spec *spec,
+                                              const struct auto_pin_cfg *cfg)
+{
+        char name[32];
+        static const char *chname[3] = { "Front", "Surround", "C/LFE" };
+        hda_nid_t nid_vols[] = {0x10, 0x11, 0x25};
+        hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x27};
+        hda_nid_t nid, nid_vol, nid_mute;
+        int i, err;
+
+        for (i = 0; i <= AUTO_SEQ_CENLFE; i++) {
+                nid = cfg->line_out_pins[i];
+
+                if (!nid)
+                        continue;
+
+                nid_vol = nid_vols[i];
+                nid_mute = nid_mutes[i];
+
+                if (i == AUTO_SEQ_CENLFE) {
+                        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_mute, 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_mute, 2, 0,
+                                                    HDA_OUTPUT));
+                        if (err < 0)
+                                return err;
+                } else if (i == AUTO_SEQ_FRONT) {
+
+                        err = via_add_control(
+                                spec, VIA_CTL_WIDGET_VOL,
+                                "Master Front Playback Volume",
+                                HDA_COMPOSE_AMP_VAL(0x16, 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(0x16, 3, 0, HDA_INPUT));
+                        if (err < 0)
+                                return err;
+
+                        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_mute, 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_mute, 3, 0,
+                                                    HDA_OUTPUT));
+                        if (err < 0)
+                                return err;
+                }
+        }
+        return 0;
+}
+
+static int vt1716S_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
+{
+        int err;
+
+        if (!pin)
+                return 0;
+
+        spec->multiout.hp_nid = 0x25; /* AOW3 */
+        spec->hp_independent_mode_index = 1;
+
+        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                              "Headphone Playback Volume",
+                              HDA_COMPOSE_AMP_VAL(0x25, 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;
+
+        create_hp_imux(spec);
+        return 0;
+}
+
+/* create playback/capture controls for input pins */
+static int vt1716S_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[0];
+        int i, err, idx = 0;
+
+        /* for internal loopback recording select */
+        imux->items[imux->num_items].label = "Stereo Mixer";
+        imux->items[imux->num_items].index = 5;
+        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, labels[i], idx, 0x16);
+                if (err < 0)
+                        return err;
+                imux->items[imux->num_items].label = labels[i];
+                imux->items[imux->num_items].index = idx-1;
+                imux->num_items++;
+        }
+        return 0;
+}
+
+static int vt1716S_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 = vt1716S_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 = vt1716S_auto_create_multi_out_ctls(spec, &spec->autocfg);
+        if (err < 0)
+                return err;
+        err = vt1716S_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
+        if (err < 0)
+                return err;
+        err = vt1716S_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        if (err < 0)
+                return err;
+
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+        fill_dig_outs(codec);
+
+        if (spec->kctls.list)
+                spec->mixers[spec->num_mixers++] = spec->kctls.list;
+
+        spec->input_mux = &spec->private_imux[0];
+
+        if (spec->hp_mux)
+                via_hp_build(codec);
+
+        via_smart51_build(spec);
+
+        return 1;
+}
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list vt1716S_loopbacks[] = {
+        { 0x16, HDA_INPUT, 1 },
+        { 0x16, HDA_INPUT, 2 },
+        { 0x16, HDA_INPUT, 3 },
+        { 0x16, HDA_INPUT, 4 },
+        { } /* end */
+};
+#endif
+
+static int patch_vt1716S(struct hda_codec *codec)
+{
+        struct via_spec *spec;
+        int err;
+
+        /* create a codec specific record */
+        spec = via_new_spec(codec);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        /* automatic parse from the BIOS config */
+        err = vt1716S_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[spec->num_iverbs++]  = vt1716S_volume_init_verbs;
+        spec->init_verbs[spec->num_iverbs++] = vt1716S_uniwill_init_verbs;
+
+        spec->stream_name_analog = "VT1716S Analog";
+        spec->stream_analog_playback = &vt1716S_pcm_analog_playback;
+        spec->stream_analog_capture = &vt1716S_pcm_analog_capture;
+
+        spec->stream_name_digital = "VT1716S Digital";
+        spec->stream_digital_playback = &vt1716S_pcm_digital_playback;
+
+        if (!spec->adc_nids && spec->input_mux) {
+                spec->adc_nids = vt1716S_adc_nids;
+                spec->num_adc_nids = ARRAY_SIZE(vt1716S_adc_nids);
+                get_mux_nids(codec);
+                override_mic_boost(codec, 0x1a, 0, 3, 40);
+                override_mic_boost(codec, 0x1e, 0, 3, 40);
+                spec->mixers[spec->num_mixers] = vt1716S_capture_mixer;
+                spec->num_mixers++;
+        }
+
+        spec->mixers[spec->num_mixers] = vt1716s_dmic_mixer;
+        spec->num_mixers++;
+
+        spec->mixers[spec->num_mixers++] = vt1716S_mono_out_mixer;
+
+        codec->patch_ops = via_patch_ops;
+
+        codec->patch_ops.init = via_auto_init;
+        codec->patch_ops.unsol_event = via_unsol_event;
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = vt1716S_loopbacks;
+#endif
+
+        return 0;
+}
+
+/* for vt2002P */
+
+/* capture mixer elements */
+static struct snd_kcontrol_new vt2002P_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x10, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x10, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x11, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x11, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Capture Volume", 0x2b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Capture Volume", 0x29, 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 = 2,
+                .info = via_mux_enum_info,
+                .get = via_mux_enum_get,
+                .put = via_mux_enum_put,
+        },
+        { } /* end */
+};
+
+static struct hda_verb vt2002P_volume_init_verbs[] = {
+        /*
+         * Unmute ADC0-1 and set the default input to mic-in
+         */
+        {0x8, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x9, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+
+        /* Mute 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 */
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+
+        /* MUX Indices: Mic = 0 */
+        {0x1e, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x1f, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* PW9 Output enable */
+        {0x2d, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},
+
+        /* Enable Boost Volume backdoor */
+        {0x1, 0xfb9, 0x24},
+
+        /* MW0/1/4/8: un-mute index 0 (MUXx), un-mute index 1 (MW9) */
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        /* set MUX0/1/4/8 = 0 (AOW0) */
+        {0x34, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x35, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x37, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x3b, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* set PW0 index=0 (MW0) */
+        {0x24, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* Enable AOW0 to MW9 */
+        {0x1, 0xfb8, 0x88},
+        { }
+};
+
+
+static struct hda_verb vt2002P_uniwill_init_verbs[] = {
+        {0x25, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},
+        {0x26, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},
+        {0x29, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x2a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x2b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        { }
+};
+
+static struct hda_pcm_stream vt2002P_pcm_analog_playback = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0x8, /* NID to query formats and rates */
+        .ops = {
+                .open = via_playback_pcm_open,
+                .prepare = via_playback_multi_pcm_prepare,
+                .cleanup = via_playback_multi_pcm_cleanup,
+                .close = via_pcm_open_close,
+        },
+};
+
+static struct hda_pcm_stream vt2002P_pcm_analog_capture = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0x10, /* NID to query formats and rates */
+        .ops = {
+                .open = via_pcm_open_close,
+                .prepare = via_capture_pcm_prepare,
+                .cleanup = via_capture_pcm_cleanup,
+                .close = via_pcm_open_close,
+        },
+};
+
+static struct hda_pcm_stream vt2002P_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,
+                .cleanup = via_dig_playback_pcm_cleanup
+        },
+};
+
+/* fill in the dac_nids table from the parsed pin configuration */
+static int vt2002P_auto_fill_dac_nids(struct via_spec *spec,
+                                      const struct auto_pin_cfg *cfg)
+{
+        spec->multiout.num_dacs = 1;
+        spec->multiout.dac_nids = spec->private_dac_nids;
+        if (cfg->line_out_pins[0])
+                spec->multiout.dac_nids[0] = 0x8;
+        return 0;
+}
+
+/* add playback controls from the parsed DAC table */
+static int vt2002P_auto_create_multi_out_ctls(struct via_spec *spec,
+                                             const struct auto_pin_cfg *cfg)
+{
+        int err;
+
+        if (!cfg->line_out_pins[0])
+                return -1;
+
+
+        /* Line-Out: PortE */
+        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                              "Master Front Playback Volume",
+                              HDA_COMPOSE_AMP_VAL(0x8, 3, 0, HDA_OUTPUT));
+        if (err < 0)
+                return err;
+        err = via_add_control(spec, VIA_CTL_WIDGET_BIND_PIN_MUTE,
+                              "Master Front Playback Switch",
+                              HDA_COMPOSE_AMP_VAL(0x26, 3, 0, HDA_OUTPUT));
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
+static int vt2002P_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
+{
+        int err;
+
+        if (!pin)
+                return 0;
+
+        spec->multiout.hp_nid = 0x9;
+        spec->hp_independent_mode_index = 1;
+
+        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                              "Headphone Playback Volume",
+                              HDA_COMPOSE_AMP_VAL(
+                                      spec->multiout.hp_nid, 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(0x25, 3, 0, HDA_OUTPUT));
+        if (err < 0)
+                return err;
+
+        create_hp_imux(spec);
+        return 0;
+}
+
+/* create playback/capture controls for input pins */
+static int vt2002P_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[0];
+        int i, err, idx = 0;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                if (!cfg->input_pins[i])
+                        continue;
+
+                switch (cfg->input_pins[i]) {
+                case 0x2b: /* Mic */
+                        idx = 0;
+                        break;
+
+                case 0x2a: /* Line In */
+                        idx = 1;
+                        break;
+
+                case 0x29: /* Front Mic */
+                        idx = 2;
+                        break;
+                }
+                err = via_new_analog_input(spec, labels[i], idx, 0x21);
+                if (err < 0)
+                        return err;
+                imux->items[imux->num_items].label = labels[i];
+                imux->items[imux->num_items].index = idx;
+                imux->num_items++;
+        }
+
+        /* build volume/mute control of loopback */
+        err = via_new_analog_input(spec, "Stereo Mixer", 3, 0x21);
+        if (err < 0)
+                return err;
+
+        /* for internal loopback recording select */
+        imux->items[imux->num_items].label = "Stereo Mixer";
+        imux->items[imux->num_items].index = 3;
+        imux->num_items++;
+
+        /* for digital mic select */
+        imux->items[imux->num_items].label = "Digital Mic";
+        imux->items[imux->num_items].index = 4;
+        imux->num_items++;
+
+        return 0;
+}
+
+static int vt2002P_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 = vt2002P_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 = vt2002P_auto_create_multi_out_ctls(spec, &spec->autocfg);
+        if (err < 0)
+                return err;
+        err = vt2002P_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
+        if (err < 0)
+                return err;
+        err = vt2002P_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        if (err < 0)
+                return err;
+
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+        fill_dig_outs(codec);
+
+        if (spec->kctls.list)
+                spec->mixers[spec->num_mixers++] = spec->kctls.list;
+
+        spec->input_mux = &spec->private_imux[0];
+
+        if (spec->hp_mux)
+                via_hp_build(codec);
+
+        return 1;
+}
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list vt2002P_loopbacks[] = {
+        { 0x21, HDA_INPUT, 0 },
+        { 0x21, HDA_INPUT, 1 },
+        { 0x21, HDA_INPUT, 2 },
+        { } /* end */
+};
+#endif
+
+
+/* patch for vt2002P */
+static int patch_vt2002P(struct hda_codec *codec)
+{
+        struct via_spec *spec;
+        int err;
+
+        /* create a codec specific record */
+        spec = via_new_spec(codec);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        /* automatic parse from the BIOS config */
+        err = vt2002P_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[spec->num_iverbs++]  = vt2002P_volume_init_verbs;
+        spec->init_verbs[spec->num_iverbs++] = vt2002P_uniwill_init_verbs;
+
+        spec->stream_name_analog = "VT2002P Analog";
+        spec->stream_analog_playback = &vt2002P_pcm_analog_playback;
+        spec->stream_analog_capture = &vt2002P_pcm_analog_capture;
+
+        spec->stream_name_digital = "VT2002P Digital";
+        spec->stream_digital_playback = &vt2002P_pcm_digital_playback;
+
+        if (!spec->adc_nids && spec->input_mux) {
+                spec->adc_nids = vt2002P_adc_nids;
+                spec->num_adc_nids = ARRAY_SIZE(vt2002P_adc_nids);
+                get_mux_nids(codec);
+                override_mic_boost(codec, 0x2b, 0, 3, 40);
+                override_mic_boost(codec, 0x29, 0, 3, 40);
+                spec->mixers[spec->num_mixers] = vt2002P_capture_mixer;
+                spec->num_mixers++;
+        }
+
+        codec->patch_ops = via_patch_ops;
+
+        codec->patch_ops.init = via_auto_init;
+        codec->patch_ops.unsol_event = via_unsol_event;
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = vt2002P_loopbacks;
+#endif
+
+        return 0;
+}
+
+/* for vt1812 */
+
+/* capture mixer elements */
+static struct snd_kcontrol_new vt1812_capture_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x10, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x10, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x11, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x11, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Boost Capture Volume", 0x2b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Boost Capture Volume", 0x29, 0x0,
+                       HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                /* The multiple "Capture Source" controls confuse alsamixer
+                 * So call somewhat different..
+                 */
+                .name = "Input Source",
+                .count = 2,
+                .info = via_mux_enum_info,
+                .get = via_mux_enum_get,
+                .put = via_mux_enum_put,
+        },
+        { } /* end */
+};
+
+static struct hda_verb vt1812_volume_init_verbs[] = {
+        /*
+         * Unmute ADC0-1 and set the default input to mic-in
+         */
+        {0x8, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x9, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+
+        /* Mute 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 */
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+
+        /* MUX Indices: Mic = 0 */
+        {0x1e, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x1f, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* PW9 Output enable */
+        {0x2d, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},
+
+        /* Enable Boost Volume backdoor */
+        {0x1, 0xfb9, 0x24},
+
+        /* MW0/1/4/13/15: un-mute index 0 (MUXx), un-mute index 1 (MW9) */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        /* set MUX0/1/4/13/15 = 0 (AOW0) */
+        {0x34, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x35, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x38, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x3c, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x3d, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* Enable AOW0 to MW9 */
+        {0x1, 0xfb8, 0xa8},
+        { }
+};
+
+
+static struct hda_verb vt1812_uniwill_init_verbs[] = {
+        {0x33, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},
+        {0x25, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT },
+        {0x28, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},
+        {0x29, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x2a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x2b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        { }
+};
+
+static struct hda_pcm_stream vt1812_pcm_analog_playback = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0x8, /* NID to query formats and rates */
+        .ops = {
+                .open = via_playback_pcm_open,
+                .prepare = via_playback_multi_pcm_prepare,
+                .cleanup = via_playback_multi_pcm_cleanup,
+                .close = via_pcm_open_close,
+        },
+};
+
+static struct hda_pcm_stream vt1812_pcm_analog_capture = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0x10, /* NID to query formats and rates */
+        .ops = {
+                .open = via_pcm_open_close,
+                .prepare = via_capture_pcm_prepare,
+                .cleanup = via_capture_pcm_cleanup,
+                .close = via_pcm_open_close,
+        },
+};
+
+static struct hda_pcm_stream vt1812_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,
+                .cleanup = via_dig_playback_pcm_cleanup
+        },
+};
+/* fill in the dac_nids table from the parsed pin configuration */
+static int vt1812_auto_fill_dac_nids(struct via_spec *spec,
+                                     const struct auto_pin_cfg *cfg)
+{
+        spec->multiout.num_dacs = 1;
+        spec->multiout.dac_nids = spec->private_dac_nids;
+        if (cfg->line_out_pins[0])
+                spec->multiout.dac_nids[0] = 0x8;
+        return 0;
+}
+
+
+/* add playback controls from the parsed DAC table */
+static int vt1812_auto_create_multi_out_ctls(struct via_spec *spec,
+                                             const struct auto_pin_cfg *cfg)
+{
+        int err;
+
+        if (!cfg->line_out_pins[0])
+                return -1;
+
+        /* Line-Out: PortE */
+        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                              "Front Playback Volume",
+                              HDA_COMPOSE_AMP_VAL(0x8, 3, 0, HDA_OUTPUT));
+        if (err < 0)
+                return err;
+        err = via_add_control(spec, VIA_CTL_WIDGET_BIND_PIN_MUTE,
+                              "Front Playback Switch",
+                              HDA_COMPOSE_AMP_VAL(0x28, 3, 0, HDA_OUTPUT));
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
+static int vt1812_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
+{
+        int err;
+
+        if (!pin)
+                return 0;
+
+        spec->multiout.hp_nid = 0x9;
+        spec->hp_independent_mode_index = 1;
+
+
+        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                              "Headphone Playback Volume",
+                              HDA_COMPOSE_AMP_VAL(
+                                      spec->multiout.hp_nid, 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;
+
+        create_hp_imux(spec);
+        return 0;
+}
+
+/* create playback/capture controls for input pins */
+static int vt1812_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[0];
+        int i, err, idx = 0;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                if (!cfg->input_pins[i])
+                        continue;
+
+                switch (cfg->input_pins[i]) {
+                case 0x2b: /* Mic */
+                        idx = 0;
+                        break;
+
+                case 0x2a: /* Line In */
+                        idx = 1;
+                        break;
+
+                case 0x29: /* Front Mic */
+                        idx = 2;
+                        break;
+                }
+                err = via_new_analog_input(spec, labels[i], idx, 0x21);
+                if (err < 0)
+                        return err;
+                imux->items[imux->num_items].label = labels[i];
+                imux->items[imux->num_items].index = idx;
+                imux->num_items++;
+        }
+        /* build volume/mute control of loopback */
+        err = via_new_analog_input(spec, "Stereo Mixer", 5, 0x21);
+        if (err < 0)
+                return err;
+
+        /* for internal loopback recording select */
+        imux->items[imux->num_items].label = "Stereo Mixer";
+        imux->items[imux->num_items].index = 5;
+        imux->num_items++;
+
+        /* for digital mic select */
+        imux->items[imux->num_items].label = "Digital Mic";
+        imux->items[imux->num_items].index = 6;
+        imux->num_items++;
+
+        return 0;
+}
+
+static int vt1812_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;
+        fill_dig_outs(codec);
+        err = vt1812_auto_fill_dac_nids(spec, &spec->autocfg);
+        if (err < 0)
+                return err;
+
+        if (!spec->autocfg.line_outs && !spec->autocfg.hp_outs)
+                return 0; /* can't find valid BIOS pin config */
+
+        err = vt1812_auto_create_multi_out_ctls(spec, &spec->autocfg);
+        if (err < 0)
+                return err;
+        err = vt1812_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
+        if (err < 0)
+                return err;
+        err = vt1812_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        if (err < 0)
+                return err;
+
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+        fill_dig_outs(codec);
+
+        if (spec->kctls.list)
+                spec->mixers[spec->num_mixers++] = spec->kctls.list;
+
+        spec->input_mux = &spec->private_imux[0];
+
+        if (spec->hp_mux)
+                via_hp_build(codec);
+
+        return 1;
+}
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list vt1812_loopbacks[] = {
+        { 0x21, HDA_INPUT, 0 },
+        { 0x21, HDA_INPUT, 1 },
+        { 0x21, HDA_INPUT, 2 },
+        { } /* end */
+};
+#endif
+
+
+/* patch for vt1812 */
+static int patch_vt1812(struct hda_codec *codec)
+{
+        struct via_spec *spec;
+        int err;
+
+        /* create a codec specific record */
+        spec = via_new_spec(codec);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        /* automatic parse from the BIOS config */
+        err = vt1812_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[spec->num_iverbs++]  = vt1812_volume_init_verbs;
+        spec->init_verbs[spec->num_iverbs++] = vt1812_uniwill_init_verbs;
+
+        spec->stream_name_analog = "VT1812 Analog";
+        spec->stream_analog_playback = &vt1812_pcm_analog_playback;
+        spec->stream_analog_capture = &vt1812_pcm_analog_capture;
 
-        /* Enable GPIO 0&1 for volume&mute control */
-        /* Enable GPIO 2 for DMIC-DATA */
-        response = snd_hda_codec_read(codec, codec->afg, 0, 0xF84, 0);
-        control = (unsigned char)((response >> 16) & 0x3f);
-        snd_hda_codec_write(codec,  codec->afg, 0, 0xF82, control);
+        spec->stream_name_digital = "VT1812 Digital";
+        spec->stream_digital_playback = &vt1812_pcm_digital_playback;
+
+
+        if (!spec->adc_nids && spec->input_mux) {
+                spec->adc_nids = vt1812_adc_nids;
+                spec->num_adc_nids = ARRAY_SIZE(vt1812_adc_nids);
+                get_mux_nids(codec);
+                override_mic_boost(codec, 0x2b, 0, 3, 40);
+                override_mic_boost(codec, 0x29, 0, 3, 40);
+                spec->mixers[spec->num_mixers] = vt1812_capture_mixer;
+                spec->num_mixers++;
+        }
+
+        codec->patch_ops = via_patch_ops;
+
+        codec->patch_ops.init = via_auto_init;
+        codec->patch_ops.unsol_event = via_unsol_event;
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = vt1812_loopbacks;
+#endif
 
         return 0;
 }
@@ -3318,6 +6279,23 @@ static struct hda_codec_preset snd_hda_preset_via[] = {
           .patch = patch_vt1702},
         { .id = 0x11067398, .name = "VT1702",
           .patch = patch_vt1702},
+        { .id = 0x11060428, .name = "VT1718S",
+          .patch = patch_vt1718S},
+        { .id = 0x11064428, .name = "VT1718S",
+          .patch = patch_vt1718S},
+        { .id = 0x11060441, .name = "VT2020",
+          .patch = patch_vt1718S},
+        { .id = 0x11064441, .name = "VT1828S",
+          .patch = patch_vt1718S},
+        { .id = 0x11060433, .name = "VT1716S",
+          .patch = patch_vt1716S},
+        { .id = 0x1106a721, .name = "VT1716S",
+          .patch = patch_vt1716S},
+        { .id = 0x11060438, .name = "VT2002P", .patch = patch_vt2002P},
+        { .id = 0x11064438, .name = "VT2002P", .patch = patch_vt2002P},
+        { .id = 0x11060448, .name = "VT1812", .patch = patch_vt1812},
+        { .id = 0x11060440, .name = "VT1818S",
+          .patch = patch_vt1708S},
         {} /* terminator */
 };
 
diff --git a/sound/pci/ice1712/Makefile b/sound/pci/ice1712/Makefile
index 536eae2ccf94..f7ce33f00ea5 100644
--- a/sound/pci/ice1712/Makefile
+++ b/sound/pci/ice1712/Makefile
@@ -5,7 +5,7 @@
 
 snd-ice17xx-ak4xxx-objs := ak4xxx.o
 snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o
-snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o
+snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o quartet.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o
diff --git a/sound/pci/ice1712/ak4xxx.c b/sound/pci/ice1712/ak4xxx.c
index 03391da8c8c7..90d560c3df13 100644
--- a/sound/pci/ice1712/ak4xxx.c
+++ b/sound/pci/ice1712/ak4xxx.c
@@ -24,6 +24,7 @@
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <sound/core.h>
 #include <sound/initval.h>
diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c
index 6da21a2bcade..e328cfb7620c 100644
--- a/sound/pci/ice1712/amp.c
+++ b/sound/pci/ice1712/amp.c
@@ -25,7 +25,6 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
-#include <linux/slab.h>
 #include <sound/core.h>
 
 #include "ice1712.h"
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 110d16e52733..9e66f6d306f8 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -689,42 +689,27 @@ static int aureon_ac97_mmute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
         return change;
 }
 
-static const DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1);
+static const DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -10000, 100, 1);
 static const DECLARE_TLV_DB_SCALE(db_scale_wm_pcm, -6400, 50, 1);
 static const DECLARE_TLV_DB_SCALE(db_scale_wm_adc, -1200, 100, 0);
 static const DECLARE_TLV_DB_SCALE(db_scale_ac97_master, -4650, 150, 0);
 static const DECLARE_TLV_DB_SCALE(db_scale_ac97_gain, -3450, 150, 0);
 
-/*
- * Logarithmic volume values for WM8770
- * Computed as 20 * Log10(255 / x)
- */
-static const unsigned char wm_vol[256] = {
-        127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24, 23,
-        23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,
-        17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13,
-        13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11,
-        11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,
-        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-        5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3,
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0
-};
-
-#define WM_VOL_MAX      (sizeof(wm_vol) - 1)
+#define WM_VOL_MAX      100
+#define WM_VOL_CNT      101     /* 0dB .. -100dB */
 #define WM_VOL_MUTE     0x8000
 
 static void wm_set_vol(struct snd_ice1712 *ice, unsigned int index, unsigned short vol, unsigned short master)
 {
         unsigned char nvol;
 
-        if ((master & WM_VOL_MUTE) || (vol & WM_VOL_MUTE))
+        if ((master & WM_VOL_MUTE) || (vol & WM_VOL_MUTE)) {
                 nvol = 0;
-        else
-                nvol = 127 - wm_vol[(((vol & ~WM_VOL_MUTE) * (master & ~WM_VOL_MUTE)) / 127) & WM_VOL_MAX];
+        } else {
+                nvol = ((vol % WM_VOL_CNT) * (master % WM_VOL_CNT)) /
+                                                                WM_VOL_MAX;
+                nvol += 0x1b;
+        }
 
         wm_put(ice, index, nvol);
         wm_put_nocache(ice, index, 0x180 | nvol);
@@ -795,7 +780,7 @@ static int wm_master_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_
         for (ch = 0; ch < 2; ch++) {
                 unsigned int vol = ucontrol->value.integer.value[ch];
                 if (vol > WM_VOL_MAX)
-                        continue;
+                        vol = WM_VOL_MAX;
                 vol |= spec->master[ch] & WM_VOL_MUTE;
                 if (vol != spec->master[ch]) {
                         int dac;
@@ -820,7 +805,7 @@ static int wm_vol_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
         uinfo->count = voices;
         uinfo->value.integer.min = 0;           /* mute (-101dB) */
-        uinfo->value.integer.max = 0x7F;        /* 0dB */
+        uinfo->value.integer.max = WM_VOL_MAX;  /* 0dB */
         return 0;
 }
 
@@ -850,9 +835,9 @@ static int wm_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *
         snd_ice1712_save_gpio_status(ice);
         for (i = 0; i < voices; i++) {
                 unsigned int vol = ucontrol->value.integer.value[i];
-                if (vol > 0x7f)
-                        continue;
-                vol |= spec->vol[ofs+i];
+                if (vol > WM_VOL_MAX)
+                        vol = WM_VOL_MAX;
+                vol |= spec->vol[ofs+i] & WM_VOL_MUTE;
                 if (vol != spec->vol[ofs+i]) {
                         spec->vol[ofs+i] = vol;
                         idx  = WM_DAC_ATTEN + ofs + i;
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index d74033a2cfbe..4fc6d8bc637e 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -106,7 +106,7 @@ module_param_array(dxr_enable, int, NULL, 0444);
 MODULE_PARM_DESC(dxr_enable, "Enable DXR support for Terratec DMX6FIRE.");
 
 
-static const struct pci_device_id snd_ice1712_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_ice1712_ids) = {
         { PCI_VDEVICE(ICE, PCI_DEVICE_ID_ICE_1712), 0 },   /* ICE1712 */
         { 0, }
 };
@@ -298,6 +298,16 @@ static void snd_ice1712_set_gpio_dir(struct snd_ice1712 *ice, unsigned int data)
         inb(ICEREG(ice, DATA)); /* dummy read for pci-posting */
 }
 
+static unsigned int snd_ice1712_get_gpio_dir(struct snd_ice1712 *ice)
+{
+        return snd_ice1712_read(ice, ICE1712_IREG_GPIO_DIRECTION);
+}
+
+static unsigned int snd_ice1712_get_gpio_mask(struct snd_ice1712 *ice)
+{
+        return snd_ice1712_read(ice, ICE1712_IREG_GPIO_WRITE_MASK);
+}
+
 static void snd_ice1712_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data)
 {
         snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, data);
@@ -1170,6 +1180,10 @@ static int snd_ice1712_playback_pro_open(struct snd_pcm_substream *substream)
         snd_pcm_set_sync(substream);
         snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);
         snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates);
+        if (is_pro_rate_locked(ice)) {
+                runtime->hw.rate_min = PRO_RATE_DEFAULT;
+                runtime->hw.rate_max = PRO_RATE_DEFAULT;
+        }
 
         if (ice->spdif.ops.open)
                 ice->spdif.ops.open(ice, substream);
@@ -1187,6 +1201,11 @@ static int snd_ice1712_capture_pro_open(struct snd_pcm_substream *substream)
         snd_pcm_set_sync(substream);
         snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);
         snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates);
+        if (is_pro_rate_locked(ice)) {
+                runtime->hw.rate_min = PRO_RATE_DEFAULT;
+                runtime->hw.rate_max = PRO_RATE_DEFAULT;
+        }
+
         return 0;
 }
 
@@ -2557,7 +2576,9 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
         mutex_init(&ice->i2c_mutex);
         mutex_init(&ice->open_mutex);
         ice->gpio.set_mask = snd_ice1712_set_gpio_mask;
+        ice->gpio.get_mask = snd_ice1712_get_gpio_mask;
         ice->gpio.set_dir = snd_ice1712_set_gpio_dir;
+        ice->gpio.get_dir = snd_ice1712_get_gpio_dir;
         ice->gpio.set_data = snd_ice1712_set_gpio_data;
         ice->gpio.get_data = snd_ice1712_get_gpio_data;
 
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
index d063149e7047..0da778a69ef8 100644
--- a/sound/pci/ice1712/ice1712.h
+++ b/sound/pci/ice1712/ice1712.h
@@ -359,7 +359,9 @@ struct snd_ice1712 {
                 unsigned int saved[2];          /* for ewx_i2c */
                 /* operators */
                 void (*set_mask)(struct snd_ice1712 *ice, unsigned int data);
+                unsigned int (*get_mask)(struct snd_ice1712 *ice);
                 void (*set_dir)(struct snd_ice1712 *ice, unsigned int data);
+                unsigned int (*get_dir)(struct snd_ice1712 *ice);
                 void (*set_data)(struct snd_ice1712 *ice, unsigned int data);
                 unsigned int (*get_data)(struct snd_ice1712 *ice);
                 /* misc operators - move to another place? */
@@ -377,8 +379,11 @@ struct snd_ice1712 {
         unsigned int (*get_rate)(struct snd_ice1712 *ice);
         void (*set_rate)(struct snd_ice1712 *ice, unsigned int rate);
         unsigned char (*set_mclk)(struct snd_ice1712 *ice, unsigned int rate);
-        void (*set_spdif_clock)(struct snd_ice1712 *ice);
-
+        int (*set_spdif_clock)(struct snd_ice1712 *ice, int type);
+        int (*get_spdif_master_type)(struct snd_ice1712 *ice);
+        char **ext_clock_names;
+        int ext_clock_count;
+        void (*pro_open)(struct snd_ice1712 *, struct snd_pcm_substream *);
 #ifdef CONFIG_PM
         int (*pm_suspend)(struct snd_ice1712 *);
         int (*pm_resume)(struct snd_ice1712 *);
@@ -399,6 +404,11 @@ static inline void snd_ice1712_gpio_set_dir(struct snd_ice1712 *ice, unsigned in
         ice->gpio.set_dir(ice, bits);
 }
 
+static inline unsigned int snd_ice1712_gpio_get_dir(struct snd_ice1712 *ice)
+{
+        return ice->gpio.get_dir(ice);
+}
+
 static inline void snd_ice1712_gpio_set_mask(struct snd_ice1712 *ice, unsigned int bits)
 {
         ice->gpio.set_mask(ice, bits);
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 10fc92c05574..c1498fa5545f 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -53,6 +53,7 @@
 #include "phase.h"
 #include "wtm.h"
 #include "se.h"
+#include "quartet.h"
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)");
@@ -70,6 +71,7 @@ MODULE_SUPPORTED_DEVICE("{"
                PHASE_DEVICE_DESC
                WTM_DEVICE_DESC
                SE_DEVICE_DESC
+               QTET_DEVICE_DESC
                 "{VIA,VT1720},"
                 "{VIA,VT1724},"
                 "{ICEnsemble,Generic ICE1724},"
@@ -92,7 +94,7 @@ MODULE_PARM_DESC(model, "Use the given board model.");
 
 
 /* Both VT1720 and VT1724 have the same PCI IDs */
-static const struct pci_device_id snd_vt1724_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_vt1724_ids) = {
         { PCI_VDEVICE(ICE, PCI_DEVICE_ID_VT1724), 0 },
         { 0, }
 };
@@ -104,6 +106,8 @@ static int PRO_RATE_LOCKED;
 static int PRO_RATE_RESET = 1;
 static unsigned int PRO_RATE_DEFAULT = 44100;
 
+static char *ext_clock_names[1] = { "IEC958 In" };
+
 /*
  *  Basic I/O
  */
@@ -118,9 +122,12 @@ static inline int stdclock_is_spdif_master(struct snd_ice1712 *ice)
         return (inb(ICEMT1724(ice, RATE)) & VT1724_SPDIF_MASTER) ? 1 : 0;
 }
 
+/*
+ * locking rate makes sense only for internal clock mode
+ */
 static inline int is_pro_rate_locked(struct snd_ice1712 *ice)
 {
-        return ice->is_spdif_master(ice) || PRO_RATE_LOCKED;
+        return (!ice->is_spdif_master(ice)) && PRO_RATE_LOCKED;
 }
 
 /*
@@ -196,6 +203,12 @@ static void snd_vt1724_set_gpio_dir(struct snd_ice1712 *ice, unsigned int data)
         inw(ICEREG1724(ice, GPIO_DIRECTION)); /* dummy read for pci-posting */
 }
 
+/* get gpio direction 0 = read, 1 = write */
+static unsigned int snd_vt1724_get_gpio_dir(struct snd_ice1712 *ice)
+{
+        return inl(ICEREG1724(ice, GPIO_DIRECTION));
+}
+
 /* set the gpio mask (0 = writable) */
 static void snd_vt1724_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data)
 {
@@ -205,6 +218,17 @@ static void snd_vt1724_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data)
         inw(ICEREG1724(ice, GPIO_WRITE_MASK)); /* dummy read for pci-posting */
 }
 
+static unsigned int snd_vt1724_get_gpio_mask(struct snd_ice1712 *ice)
+{
+        unsigned int mask;
+        if (!ice->vt1720)
+                mask = (unsigned int)inb(ICEREG1724(ice, GPIO_WRITE_MASK_22));
+        else
+                mask = 0;
+        mask = (mask << 16) | inw(ICEREG1724(ice, GPIO_WRITE_MASK));
+        return mask;
+}
+
 static void snd_vt1724_set_gpio_data(struct snd_ice1712 *ice, unsigned int data)
 {
         outw(data, ICEREG1724(ice, GPIO_DATA));
@@ -651,16 +675,22 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,
                 return ((rate == ice->cur_rate) && !force) ? 0 : -EBUSY;
         }
         if (!force && is_pro_rate_locked(ice)) {
+                /* comparing required and current rate - makes sense for
+                 * internal clock only */
                 spin_unlock_irqrestore(&ice->reg_lock, flags);
                 return (rate == ice->cur_rate) ? 0 : -EBUSY;
         }
 
-        old_rate = ice->get_rate(ice);
-        if (force || (old_rate != rate))
-                ice->set_rate(ice, rate);
-        else if (rate == ice->cur_rate) {
-                spin_unlock_irqrestore(&ice->reg_lock, flags);
-                return 0;
+        if (force || !ice->is_spdif_master(ice)) {
+                /* force means the rate was switched by ucontrol, otherwise
+                 * setting clock rate for internal clock mode */
+                old_rate = ice->get_rate(ice);
+                if (force || (old_rate != rate))
+                        ice->set_rate(ice, rate);
+                else if (rate == ice->cur_rate) {
+                        spin_unlock_irqrestore(&ice->reg_lock, flags);
+                        return 0;
+                }
         }
 
         ice->cur_rate = rate;
@@ -1016,6 +1046,8 @@ static int snd_vt1724_playback_pro_open(struct snd_pcm_substream *substream)
                                    VT1724_BUFFER_ALIGN);
         snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
                                    VT1724_BUFFER_ALIGN);
+        if (ice->pro_open)
+                ice->pro_open(ice, substream);
         return 0;
 }
 
@@ -1034,6 +1066,8 @@ static int snd_vt1724_capture_pro_open(struct snd_pcm_substream *substream)
                                    VT1724_BUFFER_ALIGN);
         snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
                                    VT1724_BUFFER_ALIGN);
+        if (ice->pro_open)
+                ice->pro_open(ice, substream);
         return 0;
 }
 
@@ -1787,15 +1821,21 @@ static int snd_vt1724_pro_internal_clock_info(struct snd_kcontrol *kcontrol,
                                               struct snd_ctl_elem_info *uinfo)
 {
         struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
-
+        int hw_rates_count = ice->hw_rates->count;
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
-        uinfo->value.enumerated.items = ice->hw_rates->count + 1;
+
+        uinfo->value.enumerated.items = hw_rates_count + ice->ext_clock_count;
+        /* upper limit - keep at top */
         if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
                 uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
-        if (uinfo->value.enumerated.item == uinfo->value.enumerated.items - 1)
-                strcpy(uinfo->value.enumerated.name, "IEC958 Input");
+        if (uinfo->value.enumerated.item >= hw_rates_count)
+                /* ext_clock items */
+                strcpy(uinfo->value.enumerated.name,
+                                ice->ext_clock_names[
+                                uinfo->value.enumerated.item - hw_rates_count]);
         else
+                /* int clock items */
                 sprintf(uinfo->value.enumerated.name, "%d",
                         ice->hw_rates->list[uinfo->value.enumerated.item]);
         return 0;
@@ -1809,7 +1849,8 @@ static int snd_vt1724_pro_internal_clock_get(struct snd_kcontrol *kcontrol,
 
         spin_lock_irq(&ice->reg_lock);
         if (ice->is_spdif_master(ice)) {
-                ucontrol->value.enumerated.item[0] = ice->hw_rates->count;
+                ucontrol->value.enumerated.item[0] = ice->hw_rates->count +
+                        ice->get_spdif_master_type(ice);
         } else {
                 rate = ice->get_rate(ice);
                 ucontrol->value.enumerated.item[0] = 0;
@@ -1824,8 +1865,14 @@ static int snd_vt1724_pro_internal_clock_get(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
+static int stdclock_get_spdif_master_type(struct snd_ice1712 *ice)
+{
+        /* standard external clock - only single type - SPDIF IN */
+        return 0;
+}
+
 /* setting clock to external - SPDIF */
-static void stdclock_set_spdif_clock(struct snd_ice1712 *ice)
+static int stdclock_set_spdif_clock(struct snd_ice1712 *ice, int type)
 {
         unsigned char oval;
         unsigned char i2s_oval;
@@ -1834,27 +1881,30 @@ static void stdclock_set_spdif_clock(struct snd_ice1712 *ice)
         /* setting 256fs */
         i2s_oval = inb(ICEMT1724(ice, I2S_FORMAT));
         outb(i2s_oval & ~VT1724_MT_I2S_MCLK_128X, ICEMT1724(ice, I2S_FORMAT));
+        return 0;
 }
 
+
 static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
                                              struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
         unsigned int old_rate, new_rate;
         unsigned int item = ucontrol->value.enumerated.item[0];
-        unsigned int spdif = ice->hw_rates->count;
+        unsigned int first_ext_clock = ice->hw_rates->count;
 
-        if (item > spdif)
+        if (item >  first_ext_clock + ice->ext_clock_count - 1)
                 return -EINVAL;
 
+        /* if rate = 0 => external clock */
         spin_lock_irq(&ice->reg_lock);
         if (ice->is_spdif_master(ice))
                 old_rate = 0;
         else
                 old_rate = ice->get_rate(ice);
-        if (item == spdif) {
-                /* switching to external clock via SPDIF */
-                ice->set_spdif_clock(ice);
+        if (item >= first_ext_clock) {
+                /* switching to external clock */
+                ice->set_spdif_clock(ice, item - first_ext_clock);
                 new_rate = 0;
         } else {
                 /* internal on-card clock */
@@ -1866,7 +1916,7 @@ static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
         }
         spin_unlock_irq(&ice->reg_lock);
 
-        /* the first reset to the SPDIF master mode? */
+        /* the first switch to the ext. clock mode? */
         if (old_rate != new_rate && !new_rate) {
                 /* notify akm chips as well */
                 unsigned int i;
@@ -2136,6 +2186,7 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
         snd_vt1724_phase_cards,
         snd_vt1724_wtm_cards,
         snd_vt1724_se_cards,
+        snd_vt1724_qtet_cards,
         NULL,
 };
 
@@ -2434,7 +2485,9 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
         mutex_init(&ice->open_mutex);
         mutex_init(&ice->i2c_mutex);
         ice->gpio.set_mask = snd_vt1724_set_gpio_mask;
+        ice->gpio.get_mask = snd_vt1724_get_gpio_mask;
         ice->gpio.set_dir = snd_vt1724_set_gpio_dir;
+        ice->gpio.get_dir = snd_vt1724_get_gpio_dir;
         ice->gpio.set_data = snd_vt1724_set_gpio_data;
         ice->gpio.get_data = snd_vt1724_get_gpio_data;
         ice->card = card;
@@ -2522,6 +2575,9 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci,
                 return err;
         }
 
+        /* field init before calling chip_init */
+        ice->ext_clock_count = 0;
+
         for (tbl = card_tables; *tbl; tbl++) {
                 for (c = *tbl; c->subvendor; c++) {
                         if (c->subvendor == ice->eeprom.subvendor) {
@@ -2560,6 +2616,13 @@ __found:
                 ice->set_mclk = stdclock_set_mclk;
         if (!ice->set_spdif_clock)
                 ice->set_spdif_clock = stdclock_set_spdif_clock;
+        if (!ice->get_spdif_master_type)
+                ice->get_spdif_master_type = stdclock_get_spdif_master_type;
+        if (!ice->ext_clock_names)
+                ice->ext_clock_names = ext_clock_names;
+        if (!ice->ext_clock_count)
+                ice->ext_clock_count = ARRAY_SIZE(ext_clock_names);
+
         if (!ice->hw_rates)
                 set_std_hw_rates(ice);
 
@@ -2719,7 +2782,7 @@ static int snd_vt1724_resume(struct pci_dev *pci)
 
         if (ice->pm_saved_is_spdif_master) {
                 /* switching to external clock via SPDIF */
-                ice->set_spdif_clock(ice);
+                ice->set_spdif_clock(ice, 0);
         } else {
                 /* internal on-card clock */
                 snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 1);
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index fd948bfd9aef..98bc3b7681b5 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -380,7 +380,7 @@ static struct snd_kcontrol_new juli_mute_controls[] __devinitdata = {
          * inputs) are fed from Xilinx.
          *
          * I even checked traces on board and coded a support in driver for
-         * an alternative possiblity - the unused I2S ICE output channels
+         * an alternative possibility - the unused I2S ICE output channels
          * switched to HW-IN/SPDIF-IN and providing the monitoring signal to
          * the DAC - to no avail. The I2S outputs seem to be unconnected.
          *
@@ -412,25 +412,6 @@ static struct snd_kcontrol_new juli_mute_controls[] __devinitdata = {
         },
 };
 
-
-static void ak4358_proc_regs_read(struct snd_info_entry *entry,
-                struct snd_info_buffer *buffer)
-{
-        struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data;
-        int reg, val;
-        for (reg = 0; reg <= 0xf; reg++) {
-                val =  snd_akm4xxx_get(ice->akm, 0, reg);
-                snd_iprintf(buffer, "0x%02x = 0x%02x\n", reg, val);
-        }
-}
-
-static void ak4358_proc_init(struct snd_ice1712 *ice)
-{
-        struct snd_info_entry *entry;
-        if (!snd_card_proc_new(ice->card, "ak4358_codec", &entry))
-                snd_info_set_text_ops(entry, ice, ak4358_proc_regs_read);
-}
-
 static char *slave_vols[] __devinitdata = {
         PCM_VOLUME,
         MONITOR_AN_IN_VOLUME,
@@ -496,14 +477,37 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice)
         /* only capture SPDIF over AK4114 */
         err = snd_ak4114_build(spec->ak4114, NULL,
                         ice->pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream);
-
-        ak4358_proc_init(ice);
         if (err < 0)
                 return err;
         return 0;
 }
 
 /*
+ * suspend/resume
+ * */
+
+#ifdef CONFIG_PM
+static int juli_resume(struct snd_ice1712 *ice)
+{
+        struct snd_akm4xxx *ak = ice->akm;
+        struct juli_spec *spec = ice->spec;
+        /* akm4358 un-reset, un-mute */
+        snd_akm4xxx_reset(ak, 0);
+        /* reinit ak4114 */
+        snd_ak4114_reinit(spec->ak4114);
+        return 0;
+}
+
+static int juli_suspend(struct snd_ice1712 *ice)
+{
+        struct snd_akm4xxx *ak = ice->akm;
+        /* akm4358 reset and soft-mute */
+        snd_akm4xxx_reset(ak, 1);
+        return 0;
+}
+#endif
+
+/*
  * initialize the chip
  */
 
@@ -550,13 +554,14 @@ static inline unsigned char juli_set_mclk(struct snd_ice1712 *ice,
 }
 
 /* setting clock to external - SPDIF */
-static void juli_set_spdif_clock(struct snd_ice1712 *ice)
+static int juli_set_spdif_clock(struct snd_ice1712 *ice, int type)
 {
         unsigned int old;
         old = ice->gpio.get_data(ice);
         /* external clock (= 0), multiply 1x, 48kHz */
         ice->gpio.set_data(ice, (old & ~GPIO_RATE_MASK) | GPIO_MULTI_1X |
                         GPIO_FREQ_48KHZ);
+        return 0;
 }
 
 /* Called when ak4114 detects change in the input SPDIF stream */
@@ -646,6 +651,13 @@ static int __devinit juli_init(struct snd_ice1712 *ice)
         ice->set_spdif_clock = juli_set_spdif_clock;
 
         ice->spdif.ops.open = juli_spdif_in_open;
+
+#ifdef CONFIG_PM
+        ice->pm_resume = juli_resume;
+        ice->pm_suspend = juli_suspend;
+        ice->pm_suspend_enabled = 1;
+#endif
+
         return 0;
 }
 
diff --git a/sound/pci/ice1712/maya44.c b/sound/pci/ice1712/maya44.c
index 3e1c20ae2f1c..726fd4b92e19 100644
--- a/sound/pci/ice1712/maya44.c
+++ b/sound/pci/ice1712/maya44.c
@@ -347,7 +347,7 @@ static int maya_gpio_sw_put(struct snd_kcontrol *kcontrol,
 
 /* known working input slots (0-4) */
 #define MAYA_LINE_IN    1       /* in-2 */
-#define MAYA_MIC_IN     4       /* in-5 */
+#define MAYA_MIC_IN     3       /* in-4 */
 
 static void wm8776_select_input(struct snd_maya44 *chip, int idx, int line)
 {
@@ -393,8 +393,8 @@ static int maya_rec_src_put(struct snd_kcontrol *kcontrol,
         int changed;
 
         mutex_lock(&chip->mutex);
-        changed = maya_set_gpio_bits(chip->ice, GPIO_MIC_RELAY,
-                                     sel ? GPIO_MIC_RELAY : 0);
+        changed = maya_set_gpio_bits(chip->ice, 1 << GPIO_MIC_RELAY,
+                                     sel ? (1 << GPIO_MIC_RELAY) : 0);
         wm8776_select_input(chip, 0, sel ? MAYA_MIC_IN : MAYA_LINE_IN);
         mutex_unlock(&chip->mutex);
         return changed;
diff --git a/sound/pci/ice1712/quartet.c b/sound/pci/ice1712/quartet.c
new file mode 100644
index 000000000000..1948632787e6
--- /dev/null
+++ b/sound/pci/ice1712/quartet.c
@@ -0,0 +1,1130 @@
+/*
+ *   ALSA driver for ICEnsemble VT1724 (Envy24HT)
+ *
+ *   Lowlevel functions for Infrasonic Quartet
+ *
+ *      Copyright (c) 2009 Pavel Hofman <pavel.hofman@ivitera.com>
+ *
+ *
+ *   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; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program 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 <asm/io.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/tlv.h>
+#include <sound/info.h>
+
+#include "ice1712.h"
+#include "envy24ht.h"
+#include <sound/ak4113.h>
+#include "quartet.h"
+
+struct qtet_spec {
+        struct ak4113 *ak4113;
+        unsigned int scr;       /* system control register */
+        unsigned int mcr;       /* monitoring control register */
+        unsigned int cpld;      /* cpld register */
+};
+
+struct qtet_kcontrol_private {
+        unsigned int bit;
+        void (*set_register)(struct snd_ice1712 *ice, unsigned int val);
+        unsigned int (*get_register)(struct snd_ice1712 *ice);
+        unsigned char *texts[2];
+};
+
+enum {
+        IN12_SEL = 0,
+        IN34_SEL,
+        AIN34_SEL,
+        COAX_OUT,
+        IN12_MON12,
+        IN12_MON34,
+        IN34_MON12,
+        IN34_MON34,
+        OUT12_MON34,
+        OUT34_MON12,
+};
+
+static char *ext_clock_names[3] = {"IEC958 In", "Word Clock 1xFS",
+        "Word Clock 256xFS"};
+
+/* chip address on I2C bus */
+#define AK4113_ADDR             0x26    /* S/PDIF receiver */
+
+/* chip address on SPI bus */
+#define AK4620_ADDR             0x02    /* ADC/DAC */
+
+
+/*
+ * GPIO pins
+ */
+
+/* GPIO0 - O - DATA0, def. 0 */
+#define GPIO_D0                 (1<<0)
+/* GPIO1 - I/O - DATA1, Jack Detect Input0 (0:present, 1:missing), def. 1 */
+#define GPIO_D1_JACKDTC0        (1<<1)
+/* GPIO2 - I/O - DATA2, Jack Detect Input1 (0:present, 1:missing), def. 1 */
+#define GPIO_D2_JACKDTC1        (1<<2)
+/* GPIO3 - I/O - DATA3, def. 1 */
+#define GPIO_D3                 (1<<3)
+/* GPIO4 - I/O - DATA4, SPI CDTO, def. 1 */
+#define GPIO_D4_SPI_CDTO        (1<<4)
+/* GPIO5 - I/O - DATA5, SPI CCLK, def. 1 */
+#define GPIO_D5_SPI_CCLK        (1<<5)
+/* GPIO6 - I/O - DATA6, Cable Detect Input (0:detected, 1:not detected */
+#define GPIO_D6_CD              (1<<6)
+/* GPIO7 - I/O - DATA7, Device Detect Input (0:detected, 1:not detected */
+#define GPIO_D7_DD              (1<<7)
+/* GPIO8 - O - CPLD Chip Select, def. 1 */
+#define GPIO_CPLD_CSN           (1<<8)
+/* GPIO9 - O - CPLD register read/write (0:write, 1:read), def. 0 */
+#define GPIO_CPLD_RW            (1<<9)
+/* GPIO10 - O - SPI Chip Select for CODEC#0, def. 1 */
+#define GPIO_SPI_CSN0           (1<<10)
+/* GPIO11 - O - SPI Chip Select for CODEC#1, def. 1 */
+#define GPIO_SPI_CSN1           (1<<11)
+/* GPIO12 - O - Ex. Register Output Enable (0:enable, 1:disable), def. 1,
+ * init 0 */
+#define GPIO_EX_GPIOE           (1<<12)
+/* GPIO13 - O - Ex. Register0 Chip Select for System Control Register,
+ * def. 1 */
+#define GPIO_SCR                (1<<13)
+/* GPIO14 - O - Ex. Register1 Chip Select for Monitor Control Register,
+ * def. 1 */
+#define GPIO_MCR                (1<<14)
+
+#define GPIO_SPI_ALL            (GPIO_D4_SPI_CDTO | GPIO_D5_SPI_CCLK |\
+                GPIO_SPI_CSN0 | GPIO_SPI_CSN1)
+
+#define GPIO_DATA_MASK          (GPIO_D0 | GPIO_D1_JACKDTC0 | \
+                GPIO_D2_JACKDTC1 | GPIO_D3 | \
+                GPIO_D4_SPI_CDTO | GPIO_D5_SPI_CCLK | \
+                GPIO_D6_CD | GPIO_D7_DD)
+
+/* System Control Register GPIO_SCR data bits */
+/* Mic/Line select relay (0:line, 1:mic) */
+#define SCR_RELAY               GPIO_D0
+/* Phantom power drive control (0:5V, 1:48V) */
+#define SCR_PHP_V               GPIO_D1_JACKDTC0
+/* H/W mute control (0:Normal, 1:Mute) */
+#define SCR_MUTE                GPIO_D2_JACKDTC1
+/* Phantom power control (0:Phantom on, 1:off) */
+#define SCR_PHP                 GPIO_D3
+/* Analog input 1/2 Source Select */
+#define SCR_AIN12_SEL0          GPIO_D4_SPI_CDTO
+#define SCR_AIN12_SEL1          GPIO_D5_SPI_CCLK
+/* Analog input 3/4 Source Select (0:line, 1:hi-z) */
+#define SCR_AIN34_SEL           GPIO_D6_CD
+/* Codec Power Down (0:power down, 1:normal) */
+#define SCR_CODEC_PDN           GPIO_D7_DD
+
+#define SCR_AIN12_LINE          (0)
+#define SCR_AIN12_MIC           (SCR_AIN12_SEL0)
+#define SCR_AIN12_LOWCUT        (SCR_AIN12_SEL1 | SCR_AIN12_SEL0)
+
+/* Monitor Control Register GPIO_MCR data bits */
+/* Input 1/2 to Monitor 1/2 (0:off, 1:on) */
+#define MCR_IN12_MON12          GPIO_D0
+/* Input 1/2 to Monitor 3/4 (0:off, 1:on) */
+#define MCR_IN12_MON34          GPIO_D1_JACKDTC0
+/* Input 3/4 to Monitor 1/2 (0:off, 1:on) */
+#define MCR_IN34_MON12          GPIO_D2_JACKDTC1
+/* Input 3/4 to Monitor 3/4 (0:off, 1:on) */
+#define MCR_IN34_MON34          GPIO_D3
+/* Output to Monitor 1/2 (0:off, 1:on) */
+#define MCR_OUT34_MON12         GPIO_D4_SPI_CDTO
+/* Output to Monitor 3/4 (0:off, 1:on) */
+#define MCR_OUT12_MON34         GPIO_D5_SPI_CCLK
+
+/* CPLD Register DATA bits */
+/* Clock Rate Select */
+#define CPLD_CKS0               GPIO_D0
+#define CPLD_CKS1               GPIO_D1_JACKDTC0
+#define CPLD_CKS2               GPIO_D2_JACKDTC1
+/* Sync Source Select (0:Internal, 1:External) */
+#define CPLD_SYNC_SEL           GPIO_D3
+/* Word Clock FS Select (0:FS, 1:256FS) */
+#define CPLD_WORD_SEL           GPIO_D4_SPI_CDTO
+/* Coaxial Output Source (IS-Link) (0:SPDIF, 1:I2S) */
+#define CPLD_COAX_OUT           GPIO_D5_SPI_CCLK
+/* Input 1/2 Source Select (0:Analog12, 1:An34) */
+#define CPLD_IN12_SEL           GPIO_D6_CD
+/* Input 3/4 Source Select (0:Analog34, 1:Digital In) */
+#define CPLD_IN34_SEL           GPIO_D7_DD
+
+/* internal clock (CPLD_SYNC_SEL = 0) options */
+#define CPLD_CKS_44100HZ        (0)
+#define CPLD_CKS_48000HZ        (CPLD_CKS0)
+#define CPLD_CKS_88200HZ        (CPLD_CKS1)
+#define CPLD_CKS_96000HZ        (CPLD_CKS1 | CPLD_CKS0)
+#define CPLD_CKS_176400HZ       (CPLD_CKS2)
+#define CPLD_CKS_192000HZ       (CPLD_CKS2 | CPLD_CKS0)
+
+#define CPLD_CKS_MASK           (CPLD_CKS0 | CPLD_CKS1 | CPLD_CKS2)
+
+/* external clock (CPLD_SYNC_SEL = 1) options */
+/* external clock - SPDIF */
+#define CPLD_EXT_SPDIF  (0 | CPLD_SYNC_SEL)
+/* external clock - WordClock 1xfs */
+#define CPLD_EXT_WORDCLOCK_1FS  (CPLD_CKS1 | CPLD_SYNC_SEL)
+/* external clock - WordClock 256xfs */
+#define CPLD_EXT_WORDCLOCK_256FS        (CPLD_CKS1 | CPLD_WORD_SEL |\
+                CPLD_SYNC_SEL)
+
+#define EXT_SPDIF_TYPE                  0
+#define EXT_WORDCLOCK_1FS_TYPE          1
+#define EXT_WORDCLOCK_256FS_TYPE        2
+
+#define AK4620_DFS0             (1<<0)
+#define AK4620_DFS1             (1<<1)
+#define AK4620_CKS0             (1<<2)
+#define AK4620_CKS1             (1<<3)
+/* Clock and Format Control register */
+#define AK4620_DFS_REG          0x02
+
+/* Deem and Volume Control register */
+#define AK4620_DEEMVOL_REG      0x03
+#define AK4620_SMUTE            (1<<7)
+
+/*
+ * Conversion from int value to its binary form. Used for debugging.
+ * The output buffer must be allocated prior to calling the function.
+ */
+static char *get_binary(char *buffer, int value)
+{
+        int i, j, pos;
+        pos = 0;
+        for (i = 0; i < 4; ++i) {
+                for (j = 0; j < 8; ++j) {
+                        if (value & (1 << (31-(i*8 + j))))
+                                buffer[pos] = '1';
+                        else
+                                buffer[pos] = '0';
+                        pos++;
+                }
+                if (i < 3) {
+                        buffer[pos] = ' ';
+                        pos++;
+                }
+        }
+        buffer[pos] = '\0';
+        return buffer;
+}
+
+/*
+ * Initial setup of the conversion array GPIO <-> rate
+ */
+static unsigned int qtet_rates[] = {
+        44100, 48000, 88200,
+        96000, 176400, 192000,
+};
+
+static unsigned int cks_vals[] = {
+        CPLD_CKS_44100HZ, CPLD_CKS_48000HZ, CPLD_CKS_88200HZ,
+        CPLD_CKS_96000HZ, CPLD_CKS_176400HZ, CPLD_CKS_192000HZ,
+};
+
+static struct snd_pcm_hw_constraint_list qtet_rates_info = {
+        .count = ARRAY_SIZE(qtet_rates),
+        .list = qtet_rates,
+        .mask = 0,
+};
+
+static void qtet_ak4113_write(void *private_data, unsigned char reg,
+                unsigned char val)
+{
+        snd_vt1724_write_i2c((struct snd_ice1712 *)private_data, AK4113_ADDR,
+                        reg, val);
+}
+
+static unsigned char qtet_ak4113_read(void *private_data, unsigned char reg)
+{
+        return snd_vt1724_read_i2c((struct snd_ice1712 *)private_data,
+                        AK4113_ADDR, reg);
+}
+
+
+/*
+ * AK4620 section
+ */
+
+/*
+ * Write data to addr register of ak4620
+ */
+static void qtet_akm_write(struct snd_akm4xxx *ak, int chip,
+                unsigned char addr, unsigned char data)
+{
+        unsigned int tmp, orig_dir;
+        int idx;
+        unsigned int addrdata;
+        struct snd_ice1712 *ice = ak->private_data[0];
+
+        if (snd_BUG_ON(chip < 0 || chip >= 4))
+                return;
+        /*printk(KERN_DEBUG "Writing to AK4620: chip=%d, addr=0x%x,
+          data=0x%x\n", chip, addr, data);*/
+        orig_dir = ice->gpio.get_dir(ice);
+        ice->gpio.set_dir(ice, orig_dir | GPIO_SPI_ALL);
+        /* set mask - only SPI bits */
+        ice->gpio.set_mask(ice, ~GPIO_SPI_ALL);
+
+        tmp = ice->gpio.get_data(ice);
+        /* high all */
+        tmp |= GPIO_SPI_ALL;
+        ice->gpio.set_data(ice, tmp);
+        udelay(100);
+        /* drop chip select */
+        if (chip)
+                /* CODEC 1 */
+                tmp &= ~GPIO_SPI_CSN1;
+        else
+                tmp &= ~GPIO_SPI_CSN0;
+        ice->gpio.set_data(ice, tmp);
+        udelay(100);
+
+        /* build I2C address + data byte */
+        addrdata = (AK4620_ADDR << 6) | 0x20 | (addr & 0x1f);
+        addrdata = (addrdata << 8) | data;
+        for (idx = 15; idx >= 0; idx--) {
+                /* drop clock */
+                tmp &= ~GPIO_D5_SPI_CCLK;
+                ice->gpio.set_data(ice, tmp);
+                udelay(100);
+                /* set data */
+                if (addrdata & (1 << idx))
+                        tmp |= GPIO_D4_SPI_CDTO;
+                else
+                        tmp &= ~GPIO_D4_SPI_CDTO;
+                ice->gpio.set_data(ice, tmp);
+                udelay(100);
+                /* raise clock */
+                tmp |= GPIO_D5_SPI_CCLK;
+                ice->gpio.set_data(ice, tmp);
+                udelay(100);
+        }
+        /* all back to 1 */
+        tmp |= GPIO_SPI_ALL;
+        ice->gpio.set_data(ice, tmp);
+        udelay(100);
+
+        /* return all gpios to non-writable */
+        ice->gpio.set_mask(ice, 0xffffff);
+        /* restore GPIOs direction */
+        ice->gpio.set_dir(ice, orig_dir);
+}
+
+static void qtet_akm_set_regs(struct snd_akm4xxx *ak, unsigned char addr,
+                unsigned char mask, unsigned char value)
+{
+        unsigned char tmp;
+        int chip;
+        for (chip = 0; chip < ak->num_chips; chip++) {
+                tmp = snd_akm4xxx_get(ak, chip, addr);
+                /* clear the bits */
+                tmp &= ~mask;
+                /* set the new bits */
+                tmp |= value;
+                snd_akm4xxx_write(ak, chip, addr, tmp);
+        }
+}
+
+/*
+ * change the rate of AK4620
+ */
+static void qtet_akm_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate)
+{
+        unsigned char ak4620_dfs;
+
+        if (rate == 0)  /* no hint - S/PDIF input is master or the new spdif
+                           input rate undetected, simply return */
+                return;
+
+        /* adjust DFS on codecs - see datasheet */
+        if (rate > 108000)
+                ak4620_dfs = AK4620_DFS1 | AK4620_CKS1;
+        else if (rate > 54000)
+                ak4620_dfs = AK4620_DFS0 | AK4620_CKS0;
+        else
+                ak4620_dfs = 0;
+
+        /* set new value */
+        qtet_akm_set_regs(ak, AK4620_DFS_REG, AK4620_DFS0 | AK4620_DFS1 |
+                        AK4620_CKS0 | AK4620_CKS1, ak4620_dfs);
+}
+
+#define AK_CONTROL(xname, xch)  { .name = xname, .num_channels = xch }
+
+#define PCM_12_PLAYBACK_VOLUME  "PCM 1/2 Playback Volume"
+#define PCM_34_PLAYBACK_VOLUME  "PCM 3/4 Playback Volume"
+#define PCM_12_CAPTURE_VOLUME   "PCM 1/2 Capture Volume"
+#define PCM_34_CAPTURE_VOLUME   "PCM 3/4 Capture Volume"
+
+static const struct snd_akm4xxx_dac_channel qtet_dac[] = {
+        AK_CONTROL(PCM_12_PLAYBACK_VOLUME, 2),
+        AK_CONTROL(PCM_34_PLAYBACK_VOLUME, 2),
+};
+
+static const struct snd_akm4xxx_adc_channel qtet_adc[] = {
+        AK_CONTROL(PCM_12_CAPTURE_VOLUME, 2),
+        AK_CONTROL(PCM_34_CAPTURE_VOLUME, 2),
+};
+
+static struct snd_akm4xxx akm_qtet_dac __devinitdata = {
+        .type = SND_AK4620,
+        .num_dacs = 4,  /* DAC1 - Output 12
+        */
+        .num_adcs = 4,  /* ADC1 - Input 12
+        */
+        .ops = {
+                .write = qtet_akm_write,
+                .set_rate_val = qtet_akm_set_rate_val,
+        },
+        .dac_info = qtet_dac,
+        .adc_info = qtet_adc,
+};
+
+/* Communication routines with the CPLD */
+
+
+/* Writes data to external register reg, both reg and data are
+ * GPIO representations */
+static void reg_write(struct snd_ice1712 *ice, unsigned int reg,
+                unsigned int data)
+{
+        unsigned int tmp;
+
+        mutex_lock(&ice->gpio_mutex);
+        /* set direction of used GPIOs*/
+        /* all outputs */
+        tmp = 0x00ffff;
+        ice->gpio.set_dir(ice, tmp);
+        /* mask - writable bits */
+        ice->gpio.set_mask(ice, ~(tmp));
+        /* write the data */
+        tmp = ice->gpio.get_data(ice);
+        tmp &= ~GPIO_DATA_MASK;
+        tmp |= data;
+        ice->gpio.set_data(ice, tmp);
+        udelay(100);
+        /* drop output enable */
+        tmp &=  ~GPIO_EX_GPIOE;
+        ice->gpio.set_data(ice, tmp);
+        udelay(100);
+        /* drop the register gpio */
+        tmp &= ~reg;
+        ice->gpio.set_data(ice, tmp);
+        udelay(100);
+        /* raise the register GPIO */
+        tmp |= reg;
+        ice->gpio.set_data(ice, tmp);
+        udelay(100);
+
+        /* raise all data gpios */
+        tmp |= GPIO_DATA_MASK;
+        ice->gpio.set_data(ice, tmp);
+        /* mask - immutable bits */
+        ice->gpio.set_mask(ice, 0xffffff);
+        /* outputs only 8-15 */
+        ice->gpio.set_dir(ice, 0x00ff00);
+        mutex_unlock(&ice->gpio_mutex);
+}
+
+static unsigned int get_scr(struct snd_ice1712 *ice)
+{
+        struct qtet_spec *spec = ice->spec;
+        return spec->scr;
+}
+
+static unsigned int get_mcr(struct snd_ice1712 *ice)
+{
+        struct qtet_spec *spec = ice->spec;
+        return spec->mcr;
+}
+
+static unsigned int get_cpld(struct snd_ice1712 *ice)
+{
+        struct qtet_spec *spec = ice->spec;
+        return spec->cpld;
+}
+
+static void set_scr(struct snd_ice1712 *ice, unsigned int val)
+{
+        struct qtet_spec *spec = ice->spec;
+        reg_write(ice, GPIO_SCR, val);
+        spec->scr = val;
+}
+
+static void set_mcr(struct snd_ice1712 *ice, unsigned int val)
+{
+        struct qtet_spec *spec = ice->spec;
+        reg_write(ice, GPIO_MCR, val);
+        spec->mcr = val;
+}
+
+static void set_cpld(struct snd_ice1712 *ice, unsigned int val)
+{
+        struct qtet_spec *spec = ice->spec;
+        reg_write(ice, GPIO_CPLD_CSN, val);
+        spec->cpld = val;
+}
+#ifdef CONFIG_PROC_FS
+static void proc_regs_read(struct snd_info_entry *entry,
+                struct snd_info_buffer *buffer)
+{
+        struct snd_ice1712 *ice = entry->private_data;
+        char bin_buffer[36];
+
+        snd_iprintf(buffer, "SCR:       %s\n", get_binary(bin_buffer,
+                                get_scr(ice)));
+        snd_iprintf(buffer, "MCR:       %s\n", get_binary(bin_buffer,
+                                get_mcr(ice)));
+        snd_iprintf(buffer, "CPLD:      %s\n", get_binary(bin_buffer,
+                                get_cpld(ice)));
+}
+
+static void proc_init(struct snd_ice1712 *ice)
+{
+        struct snd_info_entry *entry;
+        if (!snd_card_proc_new(ice->card, "quartet", &entry))
+                snd_info_set_text_ops(entry, ice, proc_regs_read);
+}
+#else /* !CONFIG_PROC_FS */
+static void proc_init(struct snd_ice1712 *ice) {}
+#endif
+
+static int qtet_mute_get(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
+        unsigned int val;
+        val = get_scr(ice) & SCR_MUTE;
+        ucontrol->value.integer.value[0] = (val) ? 0 : 1;
+        return 0;
+}
+
+static int qtet_mute_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
+        unsigned int old, new, smute;
+        old = get_scr(ice) & SCR_MUTE;
+        if (ucontrol->value.integer.value[0]) {
+                /* unmute */
+                new = 0;
+                /* un-smuting DAC */
+                smute = 0;
+        } else {
+                /* mute */
+                new = SCR_MUTE;
+                /* smuting DAC */
+                smute = AK4620_SMUTE;
+        }
+        if (old != new) {
+                struct snd_akm4xxx *ak = ice->akm;
+                set_scr(ice, (get_scr(ice) & ~SCR_MUTE) | new);
+                /* set smute */
+                qtet_akm_set_regs(ak, AK4620_DEEMVOL_REG, AK4620_SMUTE, smute);
+                return 1;
+        }
+        /* no change */
+        return 0;
+}
+
+static int qtet_ain12_enum_info(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[3] = {"Line In 1/2", "Mic", "Mic + Low-cut"};
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = ARRAY_SIZE(texts);
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int qtet_ain12_sw_get(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
+        unsigned int val, result;
+        val = get_scr(ice) & (SCR_AIN12_SEL1 | SCR_AIN12_SEL0);
+        switch (val) {
+        case SCR_AIN12_LINE:
+                result = 0;
+                break;
+        case SCR_AIN12_MIC:
+                result = 1;
+                break;
+        case SCR_AIN12_LOWCUT:
+                result = 2;
+                break;
+        default:
+                /* BUG - no other combinations allowed */
+                snd_BUG();
+                result = 0;
+        }
+        ucontrol->value.integer.value[0] = result;
+        return 0;
+}
+
+static int qtet_ain12_sw_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
+        unsigned int old, new, tmp, masked_old;
+        old = new = get_scr(ice);
+        masked_old = old & (SCR_AIN12_SEL1 | SCR_AIN12_SEL0);
+        tmp = ucontrol->value.integer.value[0];
+        if (tmp == 2)
+                tmp = 3;        /* binary 10 is not supported */
+        tmp <<= 4;      /* shifting to SCR_AIN12_SEL0 */
+        if (tmp != masked_old) {
+                /* change requested */
+                switch (tmp) {
+                case SCR_AIN12_LINE:
+                        new = old & ~(SCR_AIN12_SEL1 | SCR_AIN12_SEL0);
+                        set_scr(ice, new);
+                        /* turn off relay */
+                        new &= ~SCR_RELAY;
+                        set_scr(ice, new);
+                        break;
+                case SCR_AIN12_MIC:
+                        /* turn on relay */
+                        new = old | SCR_RELAY;
+                        set_scr(ice, new);
+                        new = (new & ~SCR_AIN12_SEL1) | SCR_AIN12_SEL0;
+                        set_scr(ice, new);
+                        break;
+                case SCR_AIN12_LOWCUT:
+                        /* turn on relay */
+                        new = old | SCR_RELAY;
+                        set_scr(ice, new);
+                        new |= SCR_AIN12_SEL1 | SCR_AIN12_SEL0;
+                        set_scr(ice, new);
+                        break;
+                default:
+                        snd_BUG();
+                }
+                return 1;
+        }
+        /* no change */
+        return 0;
+}
+
+static int qtet_php_get(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
+        unsigned int val;
+        /* if phantom voltage =48V, phantom on */
+        val = get_scr(ice) & SCR_PHP_V;
+        ucontrol->value.integer.value[0] = val ? 1 : 0;
+        return 0;
+}
+
+static int qtet_php_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
+        unsigned int old, new;
+        old = new = get_scr(ice);
+        if (ucontrol->value.integer.value[0] /* phantom on requested */
+                        && (~old & SCR_PHP_V)) /* 0 = voltage 5V */ {
+                /* is off, turn on */
+                /* turn voltage on first, = 1 */
+                new = old | SCR_PHP_V;
+                set_scr(ice, new);
+                /* turn phantom on, = 0 */
+                new &= ~SCR_PHP;
+                set_scr(ice, new);
+        } else if (!ucontrol->value.integer.value[0] && (old & SCR_PHP_V)) {
+                /* phantom off requested and 1 = voltage 48V */
+                /* is on, turn off */
+                /* turn voltage off first, = 0 */
+                new = old & ~SCR_PHP_V;
+                set_scr(ice, new);
+                /* turn phantom off, = 1 */
+                new |= SCR_PHP;
+                set_scr(ice, new);
+        }
+        if (old != new)
+                return 1;
+        /* no change */
+        return 0;
+}
+
+#define PRIV_SW(xid, xbit, xreg)        [xid] = {.bit = xbit,\
+        .set_register = set_##xreg,\
+        .get_register = get_##xreg, }
+
+
+#define PRIV_ENUM2(xid, xbit, xreg, xtext1, xtext2)     [xid] = {.bit = xbit,\
+        .set_register = set_##xreg,\
+        .get_register = get_##xreg,\
+        .texts = {xtext1, xtext2} }
+
+static struct qtet_kcontrol_private qtet_privates[] = {
+        PRIV_ENUM2(IN12_SEL, CPLD_IN12_SEL, cpld, "An In 1/2", "An In 3/4"),
+        PRIV_ENUM2(IN34_SEL, CPLD_IN34_SEL, cpld, "An In 3/4", "IEC958 In"),
+        PRIV_ENUM2(AIN34_SEL, SCR_AIN34_SEL, scr, "Line In 3/4", "Hi-Z"),
+        PRIV_ENUM2(COAX_OUT, CPLD_COAX_OUT, cpld, "IEC958", "I2S"),
+        PRIV_SW(IN12_MON12, MCR_IN12_MON12, mcr),
+        PRIV_SW(IN12_MON34, MCR_IN12_MON34, mcr),
+        PRIV_SW(IN34_MON12, MCR_IN34_MON12, mcr),
+        PRIV_SW(IN34_MON34, MCR_IN34_MON34, mcr),
+        PRIV_SW(OUT12_MON34, MCR_OUT12_MON34, mcr),
+        PRIV_SW(OUT34_MON12, MCR_OUT34_MON12, mcr),
+};
+
+static int qtet_enum_info(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_info *uinfo)
+{
+        struct qtet_kcontrol_private private =
+                qtet_privates[kcontrol->private_value];
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = ARRAY_SIZE(private.texts);
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+                        private.texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int qtet_sw_get(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct qtet_kcontrol_private private =
+                qtet_privates[kcontrol->private_value];
+        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.integer.value[0] =
+                (private.get_register(ice) & private.bit) ? 1 : 0;
+        return 0;
+}
+
+static int qtet_sw_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct qtet_kcontrol_private private =
+                qtet_privates[kcontrol->private_value];
+        struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
+        unsigned int old, new;
+        old = private.get_register(ice);
+        if (ucontrol->value.integer.value[0])
+                new = old | private.bit;
+        else
+                new = old & ~private.bit;
+        if (old != new) {
+                private.set_register(ice, new);
+                return 1;
+        }
+        /* no change */
+        return 0;
+}
+
+#define qtet_sw_info    snd_ctl_boolean_mono_info
+
+#define QTET_CONTROL(xname, xtype, xpriv)       \
+        {.iface = SNDRV_CTL_ELEM_IFACE_MIXER,\
+        .name = xname,\
+        .info = qtet_##xtype##_info,\
+        .get = qtet_sw_get,\
+        .put = qtet_sw_put,\
+        .private_value = xpriv }
+
+static struct snd_kcontrol_new qtet_controls[] __devinitdata = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Master Playback Switch",
+                .info = qtet_sw_info,
+                .get = qtet_mute_get,
+                .put = qtet_mute_put,
+                .private_value = 0
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Phantom Power",
+                .info = qtet_sw_info,
+                .get = qtet_php_get,
+                .put = qtet_php_put,
+                .private_value = 0
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Analog In 1/2 Capture Switch",
+                .info = qtet_ain12_enum_info,
+                .get = qtet_ain12_sw_get,
+                .put = qtet_ain12_sw_put,
+                .private_value = 0
+        },
+        QTET_CONTROL("Analog In 3/4 Capture Switch", enum, AIN34_SEL),
+        QTET_CONTROL("PCM In 1/2 Capture Switch", enum, IN12_SEL),
+        QTET_CONTROL("PCM In 3/4 Capture Switch", enum, IN34_SEL),
+        QTET_CONTROL("Coax Output Source", enum, COAX_OUT),
+        QTET_CONTROL("Analog In 1/2 to Monitor 1/2", sw, IN12_MON12),
+        QTET_CONTROL("Analog In 1/2 to Monitor 3/4", sw, IN12_MON34),
+        QTET_CONTROL("Analog In 3/4 to Monitor 1/2", sw, IN34_MON12),
+        QTET_CONTROL("Analog In 3/4 to Monitor 3/4", sw, IN34_MON34),
+        QTET_CONTROL("Output 1/2 to Monitor 3/4", sw, OUT12_MON34),
+        QTET_CONTROL("Output 3/4 to Monitor 1/2", sw, OUT34_MON12),
+};
+
+static char *slave_vols[] __devinitdata = {
+        PCM_12_PLAYBACK_VOLUME,
+        PCM_34_PLAYBACK_VOLUME,
+        NULL
+};
+
+static __devinitdata
+DECLARE_TLV_DB_SCALE(qtet_master_db_scale, -6350, 50, 1);
+
+static struct snd_kcontrol __devinit *ctl_find(struct snd_card *card,
+                const char *name)
+{
+        struct snd_ctl_elem_id sid;
+        memset(&sid, 0, sizeof(sid));
+        /* FIXME: strcpy is bad. */
+        strcpy(sid.name, name);
+        sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        return snd_ctl_find_id(card, &sid);
+}
+
+static void __devinit add_slaves(struct snd_card *card,
+                struct snd_kcontrol *master, char **list)
+{
+        for (; *list; list++) {
+                struct snd_kcontrol *slave = ctl_find(card, *list);
+                if (slave)
+                        snd_ctl_add_slave(master, slave);
+        }
+}
+
+static int __devinit qtet_add_controls(struct snd_ice1712 *ice)
+{
+        struct qtet_spec *spec = ice->spec;
+        int err, i;
+        struct snd_kcontrol *vmaster;
+        err = snd_ice1712_akm4xxx_build_controls(ice);
+        if (err < 0)
+                return err;
+        for (i = 0; i < ARRAY_SIZE(qtet_controls); i++) {
+                err = snd_ctl_add(ice->card,
+                                snd_ctl_new1(&qtet_controls[i], ice));
+                if (err < 0)
+                        return err;
+        }
+
+        /* Create virtual master control */
+        vmaster = snd_ctl_make_virtual_master("Master Playback Volume",
+                        qtet_master_db_scale);
+        if (!vmaster)
+                return -ENOMEM;
+        add_slaves(ice->card, vmaster, slave_vols);
+        err = snd_ctl_add(ice->card, vmaster);
+        if (err < 0)
+                return err;
+        /* only capture SPDIF over AK4113 */
+        err = snd_ak4113_build(spec->ak4113,
+                        ice->pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream);
+        if (err < 0)
+                return err;
+        return 0;
+}
+
+static inline int qtet_is_spdif_master(struct snd_ice1712 *ice)
+{
+        /* CPLD_SYNC_SEL: 0 = internal, 1 = external (i.e. spdif master) */
+        return (get_cpld(ice) & CPLD_SYNC_SEL) ? 1 : 0;
+}
+
+static unsigned int qtet_get_rate(struct snd_ice1712 *ice)
+{
+        int i;
+        unsigned char result;
+
+        result =  get_cpld(ice) & CPLD_CKS_MASK;
+        for (i = 0; i < ARRAY_SIZE(cks_vals); i++)
+                if (cks_vals[i] == result)
+                        return qtet_rates[i];
+        return 0;
+}
+
+static int get_cks_val(int rate)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(qtet_rates); i++)
+                if (qtet_rates[i] == rate)
+                        return cks_vals[i];
+        return 0;
+}
+
+/* setting new rate */
+static void qtet_set_rate(struct snd_ice1712 *ice, unsigned int rate)
+{
+        unsigned int new;
+        unsigned char val;
+        /* switching ice1724 to external clock - supplied by ext. circuits */
+        val = inb(ICEMT1724(ice, RATE));
+        outb(val | VT1724_SPDIF_MASTER, ICEMT1724(ice, RATE));
+
+        new =  (get_cpld(ice) & ~CPLD_CKS_MASK) | get_cks_val(rate);
+        /* switch to internal clock, drop CPLD_SYNC_SEL */
+        new &= ~CPLD_SYNC_SEL;
+        /* printk(KERN_DEBUG "QT - set_rate: old %x, new %x\n",
+           get_cpld(ice), new); */
+        set_cpld(ice, new);
+}
+
+static inline unsigned char qtet_set_mclk(struct snd_ice1712 *ice,
+                unsigned int rate)
+{
+        /* no change in master clock */
+        return 0;
+}
+
+/* setting clock to external - SPDIF */
+static int qtet_set_spdif_clock(struct snd_ice1712 *ice, int type)
+{
+        unsigned int old, new;
+
+        old = new = get_cpld(ice);
+        new &= ~(CPLD_CKS_MASK | CPLD_WORD_SEL);
+        switch (type) {
+        case EXT_SPDIF_TYPE:
+                new |= CPLD_EXT_SPDIF;
+                break;
+        case EXT_WORDCLOCK_1FS_TYPE:
+                new |= CPLD_EXT_WORDCLOCK_1FS;
+                break;
+        case EXT_WORDCLOCK_256FS_TYPE:
+                new |= CPLD_EXT_WORDCLOCK_256FS;
+                break;
+        default:
+                snd_BUG();
+        }
+        if (old != new) {
+                set_cpld(ice, new);
+                /* changed */
+                return 1;
+        }
+        return 0;
+}
+
+static int qtet_get_spdif_master_type(struct snd_ice1712 *ice)
+{
+        unsigned int val;
+        int result;
+        val = get_cpld(ice);
+        /* checking only rate/clock-related bits */
+        val &= (CPLD_CKS_MASK | CPLD_WORD_SEL | CPLD_SYNC_SEL);
+        if (!(val & CPLD_SYNC_SEL)) {
+                /* switched to internal clock, is not any external type */
+                result = -1;
+        } else {
+                switch (val) {
+                case (CPLD_EXT_SPDIF):
+                        result = EXT_SPDIF_TYPE;
+                        break;
+                case (CPLD_EXT_WORDCLOCK_1FS):
+                        result = EXT_WORDCLOCK_1FS_TYPE;
+                        break;
+                case (CPLD_EXT_WORDCLOCK_256FS):
+                        result = EXT_WORDCLOCK_256FS_TYPE;
+                        break;
+                default:
+                        /* undefined combination of external clock setup */
+                        snd_BUG();
+                        result = 0;
+                }
+        }
+        return result;
+}
+
+/* Called when ak4113 detects change in the input SPDIF stream */
+static void qtet_ak4113_change(struct ak4113 *ak4113, unsigned char c0,
+                unsigned char c1)
+{
+        struct snd_ice1712 *ice = ak4113->change_callback_private;
+        int rate;
+        if ((qtet_get_spdif_master_type(ice) == EXT_SPDIF_TYPE) &&
+                        c1) {
+                /* only for SPDIF master mode, rate was changed */
+                rate = snd_ak4113_external_rate(ak4113);
+                /* printk(KERN_DEBUG "ak4113 - input rate changed to %d\n",
+                   rate); */
+                qtet_akm_set_rate_val(ice->akm, rate);
+        }
+}
+
+/*
+ * If clock slaved to SPDIF-IN, setting runtime rate
+ * to the detected external rate
+ */
+static void qtet_spdif_in_open(struct snd_ice1712 *ice,
+                struct snd_pcm_substream *substream)
+{
+        struct qtet_spec *spec = ice->spec;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        int rate;
+
+        if (qtet_get_spdif_master_type(ice) != EXT_SPDIF_TYPE)
+                /* not external SPDIF, no rate limitation */
+                return;
+        /* only external SPDIF can detect incoming sample rate */
+        rate = snd_ak4113_external_rate(spec->ak4113);
+        if (rate >= runtime->hw.rate_min && rate <= runtime->hw.rate_max) {
+                runtime->hw.rate_min = rate;
+                runtime->hw.rate_max = rate;
+        }
+}
+
+/*
+ * initialize the chip
+ */
+static int __devinit qtet_init(struct snd_ice1712 *ice)
+{
+        static const unsigned char ak4113_init_vals[] = {
+                /* AK4113_REG_PWRDN */  AK4113_RST | AK4113_PWN |
+                        AK4113_OCKS0 | AK4113_OCKS1,
+                /* AK4113_REQ_FORMAT */ AK4113_DIF_I24I2S | AK4113_VTX |
+                        AK4113_DEM_OFF | AK4113_DEAU,
+                /* AK4113_REG_IO0 */    AK4113_OPS2 | AK4113_TXE |
+                        AK4113_XTL_24_576M,
+                /* AK4113_REG_IO1 */    AK4113_EFH_1024LRCLK | AK4113_IPS(0),
+                /* AK4113_REG_INT0_MASK */      0,
+                /* AK4113_REG_INT1_MASK */      0,
+                /* AK4113_REG_DATDTS */         0,
+        };
+        int err;
+        struct qtet_spec *spec;
+        struct snd_akm4xxx *ak;
+        unsigned char val;
+
+        /* switching ice1724 to external clock - supplied by ext. circuits */
+        val = inb(ICEMT1724(ice, RATE));
+        outb(val | VT1724_SPDIF_MASTER, ICEMT1724(ice, RATE));
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (!spec)
+                return -ENOMEM;
+        /* qtet is clocked by Xilinx array */
+        ice->hw_rates = &qtet_rates_info;
+        ice->is_spdif_master = qtet_is_spdif_master;
+        ice->get_rate = qtet_get_rate;
+        ice->set_rate = qtet_set_rate;
+        ice->set_mclk = qtet_set_mclk;
+        ice->set_spdif_clock = qtet_set_spdif_clock;
+        ice->get_spdif_master_type = qtet_get_spdif_master_type;
+        ice->ext_clock_names = ext_clock_names;
+        ice->ext_clock_count = ARRAY_SIZE(ext_clock_names);
+        /* since Qtet can detect correct SPDIF-in rate, all streams can be
+         * limited to this specific rate */
+        ice->spdif.ops.open = ice->pro_open = qtet_spdif_in_open;
+        ice->spec = spec;
+
+        /* Mute Off */
+        /* SCR Initialize*/
+        /* keep codec power down first */
+        set_scr(ice, SCR_PHP);
+        udelay(1);
+        /* codec power up */
+        set_scr(ice, SCR_PHP | SCR_CODEC_PDN);
+
+        /* MCR Initialize */
+        set_mcr(ice, 0);
+
+        /* CPLD Initialize */
+        set_cpld(ice, 0);
+
+
+        ice->num_total_dacs = 2;
+        ice->num_total_adcs = 2;
+
+        ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL);
+        ak = ice->akm;
+        if (!ak)
+                return -ENOMEM;
+        /* only one codec with two chips */
+        ice->akm_codecs = 1;
+        err = snd_ice1712_akm4xxx_init(ak, &akm_qtet_dac, NULL, ice);
+        if (err < 0)
+                return err;
+        err = snd_ak4113_create(ice->card,
+                        qtet_ak4113_read,
+                        qtet_ak4113_write,
+                        ak4113_init_vals,
+                        ice, &spec->ak4113);
+        if (err < 0)
+                return err;
+        /* callback for codecs rate setting */
+        spec->ak4113->change_callback = qtet_ak4113_change;
+        spec->ak4113->change_callback_private = ice;
+        /* AK41143 in Quartet can detect external rate correctly
+         * (i.e. check_flags = 0) */
+        spec->ak4113->check_flags = 0;
+
+        proc_init(ice);
+
+        qtet_set_rate(ice, 44100);
+        return 0;
+}
+
+static unsigned char qtet_eeprom[] __devinitdata = {
+        [ICE_EEP2_SYSCONF]     = 0x28,  /* clock 256(24MHz), mpu401, 1xADC,
+                                           1xDACs, SPDIF in */
+        [ICE_EEP2_ACLINK]      = 0x80,  /* I2S */
+        [ICE_EEP2_I2S]         = 0x78,  /* 96k, 24bit, 192k */
+        [ICE_EEP2_SPDIF]       = 0xc3,  /* out-en, out-int, in, out-ext */
+        [ICE_EEP2_GPIO_DIR]    = 0x00,  /* 0-7 inputs, switched to output
+                                           only during output operations */
+        [ICE_EEP2_GPIO_DIR1]   = 0xff,  /* 8-15 outputs */
+        [ICE_EEP2_GPIO_DIR2]   = 0x00,
+        [ICE_EEP2_GPIO_MASK]   = 0xff,  /* changed only for OUT operations */
+        [ICE_EEP2_GPIO_MASK1]  = 0x00,
+        [ICE_EEP2_GPIO_MASK2]  = 0xff,
+
+        [ICE_EEP2_GPIO_STATE]  = 0x00, /* inputs */
+        [ICE_EEP2_GPIO_STATE1] = 0x7d, /* all 1, but GPIO_CPLD_RW
+                                          and GPIO15 always zero */
+        [ICE_EEP2_GPIO_STATE2] = 0x00, /* inputs */
+};
+
+/* entry point */
+struct snd_ice1712_card_info snd_vt1724_qtet_cards[] __devinitdata = {
+        {
+                .subvendor = VT1724_SUBDEVICE_QTET,
+                .name = "Infrasonic Quartet",
+                .model = "quartet",
+                .chip_init = qtet_init,
+                .build_controls = qtet_add_controls,
+                .eeprom_size = sizeof(qtet_eeprom),
+                .eeprom_data = qtet_eeprom,
+        },
+        { } /* terminator */
+};
diff --git a/sound/pci/ice1712/quartet.h b/sound/pci/ice1712/quartet.h
new file mode 100644
index 000000000000..80809b72439a
--- /dev/null
+++ b/sound/pci/ice1712/quartet.h
@@ -0,0 +1,10 @@
+#ifndef __SOUND_QTET_H
+#define __SOUND_QTET_H
+
+#define QTET_DEVICE_DESC                "{Infrasonic,Quartet},"
+
+#define VT1724_SUBDEVICE_QTET           0x30305349      /* Infrasonic Quartet */
+
+extern struct snd_ice1712_card_info  snd_vt1724_qtet_cards[];
+
+#endif  /* __SOUND_QTET_H */
diff --git a/sound/pci/ice1712/vt1720_mobo.c b/sound/pci/ice1712/vt1720_mobo.c
index 7f9674b641c0..4c551e147c08 100644
--- a/sound/pci/ice1712/vt1720_mobo.c
+++ b/sound/pci/ice1712/vt1720_mobo.c
@@ -25,7 +25,6 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
-#include <linux/slab.h>
 #include <sound/core.h>
 
 #include "ice1712.h"
diff --git a/sound/pci/ice1712/wtm.c b/sound/pci/ice1712/wtm.c
index 5af9e84456d1..e618f789026e 100644
--- a/sound/pci/ice1712/wtm.c
+++ b/sound/pci/ice1712/wtm.c
@@ -29,7 +29,6 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
-#include <linux/slab.h>
 #include <sound/core.h>
 
 #include "ice1712.h"
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index aac20fb4aad2..6433e65c9507 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -420,7 +420,7 @@ struct intel8x0 {
         u32 int_sta_mask;               /* interrupt status mask */
 };
 
-static struct pci_device_id snd_intel8x0_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0_ids) = {
         { PCI_VDEVICE(INTEL, 0x2415), DEVICE_INTEL },   /* 82801AA */
         { PCI_VDEVICE(INTEL, 0x2425), DEVICE_INTEL },   /* 82901AB */
         { PCI_VDEVICE(INTEL, 0x2445), DEVICE_INTEL },   /* 82801BA */
@@ -2063,6 +2063,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
                 .type = AC97_TUNE_HP_ONLY
         },
         {
+                .subvendor = 0x161f,
+                .subdevice = 0x203a,
+                .name = "Gateway 4525GZ",               /* AD1981B */
+                .type = AC97_TUNE_INV_EAPD
+        },
+        {
                 .subvendor = 0x1734,
                 .subdevice = 0x0088,
                 .name = "Fujitsu-Siemens D1522",        /* AD1981 */
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 9e7d12e7673f..13cec1e5ced9 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -219,7 +219,7 @@ struct intel8x0m {
         unsigned int pcm_pos_shift;
 };
 
-static struct pci_device_id snd_intel8x0m_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = {
         { PCI_VDEVICE(INTEL, 0x2416), DEVICE_INTEL },   /* 82801AA */
         { PCI_VDEVICE(INTEL, 0x2426), DEVICE_INTEL },   /* 82901AB */
         { PCI_VDEVICE(INTEL, 0x2446), DEVICE_INTEL },   /* 82801BA */
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 7cc38a11e997..6d795700be79 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -418,7 +418,7 @@ module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Korg 1212 soundcard.");
 MODULE_AUTHOR("Haroldo Gamal <gamal@alternex.com.br>");
 
-static struct pci_device_id snd_korg1212_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_korg1212_ids) = {
         {
                 .vendor    = 0x10b5,
                 .device    = 0x906d,
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c
index 11b8c6514b3d..ef9af3f4ace2 100644
--- a/sound/pci/lx6464es/lx6464es.c
+++ b/sound/pci/lx6464es/lx6464es.c
@@ -26,6 +26,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include <sound/initval.h>
 #include <sound/control.h>
@@ -55,7 +56,7 @@ static const char card_name[] = "LX6464ES";
 
 #define PCI_DEVICE_ID_PLX_LX6464ES              PCI_DEVICE_ID_PLX_9056
 
-static struct pci_device_id snd_lx6464es_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_lx6464es_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES),
           .subvendor = PCI_VENDOR_ID_DIGIGRAM,
           .subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 75283fbb4b3f..b56e33676780 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -849,6 +849,7 @@ struct snd_m3 {
         struct snd_kcontrol *master_switch;
         struct snd_kcontrol *master_volume;
         struct tasklet_struct hwvol_tq;
+        unsigned int in_suspend;
 
 #ifdef CONFIG_PM
         u16 *suspend_mem;
@@ -861,7 +862,7 @@ struct snd_m3 {
 /*
  * pci ids
  */
-static struct pci_device_id snd_m3_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_m3_ids) = {
         {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID,
          PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
         {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO, PCI_ANY_ID, PCI_ANY_ID,
@@ -884,6 +885,7 @@ static struct pci_device_id snd_m3_ids[] = {
 MODULE_DEVICE_TABLE(pci, snd_m3_ids);
 
 static struct snd_pci_quirk m3_amp_quirk_list[] __devinitdata = {
+        SND_PCI_QUIRK(0x0E11, 0x0094, "Compaq Evo N600c", 0x0c),
         SND_PCI_QUIRK(0x10f7, 0x833e, "Panasonic CF-28", 0x0d),
         SND_PCI_QUIRK(0x10f7, 0x833d, "Panasonic CF-72", 0x0d),
         SND_PCI_QUIRK(0x1033, 0x80f1, "NEC LM800J/7", 0x03),
@@ -1613,6 +1615,11 @@ static void snd_m3_update_hw_volume(unsigned long private_data)
         outb(0x88, chip->iobase + SHADOW_MIX_REG_MASTER);
         outb(0x88, chip->iobase + HW_VOL_COUNTER_MASTER);
 
+        /* Ignore spurious HV interrupts during suspend / resume, this avoids
+           mistaking them for a mute button press. */
+        if (chip->in_suspend)
+                return;
+
         if (!chip->master_switch || !chip->master_volume)
                 return;
 
@@ -2424,6 +2431,7 @@ static int m3_suspend(struct pci_dev *pci, pm_message_t state)
         if (chip->suspend_mem == NULL)
                 return 0;
 
+        chip->in_suspend = 1;
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         snd_pcm_suspend_all(chip->pcm);
         snd_ac97_suspend(chip->ac97);
@@ -2497,6 +2505,7 @@ static int m3_resume(struct pci_dev *pci)
         snd_m3_hv_init(chip);
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+        chip->in_suspend = 0;
         return 0;
 }
 #endif /* CONFIG_PM */
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index a83d1968a845..3be8f97c8bc0 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -27,6 +27,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -60,7 +61,7 @@ MODULE_PARM_DESC(enable, "Enable Digigram " CARD_NAME " soundcard.");
 /*
  */
 
-static struct pci_device_id snd_mixart_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_mixart_ids) = {
         { PCI_VDEVICE(MOTOROLA, 0x0003), 0, }, /* MC8240 */
         { 0, }
 };
@@ -1161,13 +1162,15 @@ static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_private
                                 unsigned long count, unsigned long pos)
 {
         struct mixart_mgr *mgr = entry->private_data;
+        unsigned long maxsize;
 
-        count = count & ~3; /* make sure the read size is a multiple of 4 bytes */
-        if(count <= 0)
+        if (pos >= MIXART_BA0_SIZE)
                 return 0;
-        if(pos + count > MIXART_BA0_SIZE)
-                count = (long)(MIXART_BA0_SIZE - pos);
-        if(copy_to_user_fromio(buf, MIXART_MEM( mgr, pos ), count))
+        maxsize = MIXART_BA0_SIZE - pos;
+        if (count > maxsize)
+                count = maxsize;
+        count = count & ~3; /* make sure the read size is a multiple of 4 bytes */
+        if (copy_to_user_fromio(buf, MIXART_MEM(mgr, pos), count))
                 return -EFAULT;
         return count;
 }
@@ -1180,13 +1183,15 @@ static long snd_mixart_BA1_read(struct snd_info_entry *entry, void *file_private
                                 unsigned long count, unsigned long pos)
 {
         struct mixart_mgr *mgr = entry->private_data;
+        unsigned long maxsize;
 
-        count = count & ~3; /* make sure the read size is a multiple of 4 bytes */
-        if(count <= 0)
+        if (pos > MIXART_BA1_SIZE)
                 return 0;
-        if(pos + count > MIXART_BA1_SIZE)
-                count = (long)(MIXART_BA1_SIZE - pos);
-        if(copy_to_user_fromio(buf, MIXART_REG( mgr, pos ), count))
+        maxsize = MIXART_BA1_SIZE - pos;
+        if (count > maxsize)
+                count = maxsize;
+        count = count & ~3; /* make sure the read size is a multiple of 4 bytes */
+        if (copy_to_user_fromio(buf, MIXART_REG(mgr, pos), count))
                 return -EFAULT;
         return count;
 }
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index 4cf4cd8c939c..bf2696aa5d49 100644
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -24,6 +24,7 @@
 #include <linux/pci.h>
 #include <linux/firmware.h>
 #include <linux/vmalloc.h>
+#include <linux/slab.h>
 #include <asm/io.h>
 #include <sound/core.h>
 #include "mixart.h"
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 97a0731331a1..5a60492ac7b3 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -262,7 +262,7 @@ struct nm256 {
 /*
  * PCI ids
  */
-static struct pci_device_id snd_nm256_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_nm256_ids) = {
         {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO), 0},
         {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO), 0},
         {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO), 0},
diff --git a/sound/pci/oxygen/Makefile b/sound/pci/oxygen/Makefile
index 4ba07d42fd1d..acd8f15f7bff 100644
--- a/sound/pci/oxygen/Makefile
+++ b/sound/pci/oxygen/Makefile
@@ -1,7 +1,8 @@
 snd-oxygen-lib-objs := oxygen_io.o oxygen_lib.o oxygen_mixer.o oxygen_pcm.o
 snd-hifier-objs := hifier.o
 snd-oxygen-objs := oxygen.o
-snd-virtuoso-objs := virtuoso.o
+snd-virtuoso-objs := virtuoso.o xonar_lib.o \
+        xonar_pcm179x.o xonar_cs43xx.o xonar_wm87x6.o xonar_hdmi.o
 
 obj-$(CONFIG_SND_OXYGEN_LIB) += snd-oxygen-lib.o
 obj-$(CONFIG_SND_HIFIER) += snd-hifier.o
diff --git a/sound/pci/oxygen/cs2000.h b/sound/pci/oxygen/cs2000.h
new file mode 100644
index 000000000000..c3501bdb5edc
--- /dev/null
+++ b/sound/pci/oxygen/cs2000.h
@@ -0,0 +1,83 @@
+#ifndef CS2000_H_INCLUDED
+#define CS2000_H_INCLUDED
+
+#define CS2000_DEV_ID           0x01
+#define CS2000_DEV_CTRL         0x02
+#define CS2000_DEV_CFG_1        0x03
+#define CS2000_DEV_CFG_2        0x04
+#define CS2000_GLOBAL_CFG       0x05
+#define CS2000_RATIO_0          0x06 /* 32 bits, big endian */
+#define CS2000_RATIO_1          0x0a
+#define CS2000_RATIO_2          0x0e
+#define CS2000_RATIO_3          0x12
+#define CS2000_FUN_CFG_1        0x16
+#define CS2000_FUN_CFG_2        0x17
+#define CS2000_FUN_CFG_3        0x1e
+
+/* DEV_ID */
+#define CS2000_DEVICE_MASK              0xf8
+#define CS2000_REVISION_MASK            0x07
+
+/* DEV_CTRL */
+#define CS2000_UNLOCK                   0x80
+#define CS2000_AUX_OUT_DIS              0x02
+#define CS2000_CLK_OUT_DIS              0x01
+
+/* DEV_CFG_1 */
+#define CS2000_R_MOD_SEL_MASK           0xe0
+#define CS2000_R_MOD_SEL_1              0x00
+#define CS2000_R_MOD_SEL_2              0x20
+#define CS2000_R_MOD_SEL_4              0x40
+#define CS2000_R_MOD_SEL_8              0x60
+#define CS2000_R_MOD_SEL_1_2            0x80
+#define CS2000_R_MOD_SEL_1_4            0xa0
+#define CS2000_R_MOD_SEL_1_8            0xc0
+#define CS2000_R_MOD_SEL_1_16           0xe0
+#define CS2000_R_SEL_MASK               0x18
+#define CS2000_R_SEL_SHIFT              3
+#define CS2000_AUX_OUT_SRC_MASK         0x06
+#define CS2000_AUX_OUT_SRC_REF_CLK      0x00
+#define CS2000_AUX_OUT_SRC_CLK_IN       0x02
+#define CS2000_AUX_OUT_SRC_CLK_OUT      0x04
+#define CS2000_AUX_OUT_SRC_PLL_LOCK     0x06
+#define CS2000_EN_DEV_CFG_1             0x01
+
+/* DEV_CFG_2 */
+#define CS2000_LOCK_CLK_MASK            0x06
+#define CS2000_LOCK_CLK_SHIFT           1
+#define CS2000_FRAC_N_SRC_MASK          0x01
+#define CS2000_FRAC_N_SRC_STATIC        0x00
+#define CS2000_FRAC_N_SRC_DYNAMIC       0x01
+
+/* GLOBAL_CFG */
+#define CS2000_FREEZE                   0x08
+#define CS2000_EN_DEV_CFG_2             0x01
+
+/* FUN_CFG_1 */
+#define CS2000_CLK_SKIP_EN              0x80
+#define CS2000_AUX_LOCK_CFG_MASK        0x40
+#define CS2000_AUX_LOCK_CFG_PP_HIGH     0x00
+#define CS2000_AUX_LOCK_CFG_OD_LOW      0x40
+#define CS2000_REF_CLK_DIV_MASK         0x18
+#define CS2000_REF_CLK_DIV_4            0x00
+#define CS2000_REF_CLK_DIV_2            0x08
+#define CS2000_REF_CLK_DIV_1            0x10
+
+/* FUN_CFG_2 */
+#define CS2000_CLK_OUT_UNL              0x10
+#define CS2000_L_F_RATIO_CFG_MASK       0x08
+#define CS2000_L_F_RATIO_CFG_20_12      0x00
+#define CS2000_L_F_RATIO_CFG_12_20      0x08
+
+/* FUN_CFG_3 */
+#define CS2000_CLK_IN_BW_MASK           0x70
+#define CS2000_CLK_IN_BW_1              0x00
+#define CS2000_CLK_IN_BW_2              0x10
+#define CS2000_CLK_IN_BW_4              0x20
+#define CS2000_CLK_IN_BW_8              0x30
+#define CS2000_CLK_IN_BW_16             0x40
+#define CS2000_CLK_IN_BW_32             0x50
+#define CS2000_CLK_IN_BW_64             0x60
+#define CS2000_CLK_IN_BW_128            0x70
+
+#endif
diff --git a/sound/pci/oxygen/hifier.c b/sound/pci/oxygen/hifier.c
index 84ef13183419..5a87d683691f 100644
--- a/sound/pci/oxygen/hifier.c
+++ b/sound/pci/oxygen/hifier.c
@@ -17,6 +17,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+/*
+ * CMI8788:
+ *
+ * SPI 0 -> AK4396
+ */
+
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <sound/control.h>
@@ -42,7 +48,7 @@ MODULE_PARM_DESC(id, "ID string");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "enable card");
 
-static struct pci_device_id hifier_ids[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(hifier_ids) = {
         { OXYGEN_PCI_SUBID(0x14c3, 0x1710) },
         { OXYGEN_PCI_SUBID(0x14c3, 0x1711) },
         { OXYGEN_PCI_SUBID_BROKEN_EEPROM },
@@ -51,23 +57,28 @@ static struct pci_device_id hifier_ids[] __devinitdata = {
 MODULE_DEVICE_TABLE(pci, hifier_ids);
 
 struct hifier_data {
-        u8 ak4396_ctl2;
+        u8 ak4396_regs[5];
 };
 
 static void ak4396_write(struct oxygen *chip, u8 reg, u8 value)
 {
+        struct hifier_data *data = chip->model_data;
+
         oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER  |
                          OXYGEN_SPI_DATA_LENGTH_2 |
                          OXYGEN_SPI_CLOCK_160 |
                          (0 << OXYGEN_SPI_CODEC_SHIFT) |
                          OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
                          AK4396_WRITE | (reg << 8) | value);
+        data->ak4396_regs[reg] = value;
 }
 
-static void update_ak4396_volume(struct oxygen *chip)
+static void ak4396_write_cached(struct oxygen *chip, u8 reg, u8 value)
 {
-        ak4396_write(chip, AK4396_LCH_ATT, chip->dac_volume[0]);
-        ak4396_write(chip, AK4396_RCH_ATT, chip->dac_volume[1]);
+        struct hifier_data *data = chip->model_data;
+
+        if (value != data->ak4396_regs[reg])
+                ak4396_write(chip, reg, value);
 }
 
 static void hifier_registers_init(struct oxygen *chip)
@@ -75,16 +86,19 @@ static void hifier_registers_init(struct oxygen *chip)
         struct hifier_data *data = chip->model_data;
 
         ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
-        ak4396_write(chip, AK4396_CONTROL_2, data->ak4396_ctl2);
+        ak4396_write(chip, AK4396_CONTROL_2,
+                     data->ak4396_regs[AK4396_CONTROL_2]);
         ak4396_write(chip, AK4396_CONTROL_3, AK4396_PCM);
-        update_ak4396_volume(chip);
+        ak4396_write(chip, AK4396_LCH_ATT, chip->dac_volume[0]);
+        ak4396_write(chip, AK4396_RCH_ATT, chip->dac_volume[1]);
 }
 
 static void hifier_init(struct oxygen *chip)
 {
         struct hifier_data *data = chip->model_data;
 
-        data->ak4396_ctl2 = AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
+        data->ak4396_regs[AK4396_CONTROL_2] =
+                AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
         hifier_registers_init(chip);
 
         snd_component_add(chip->card, "AK4396");
@@ -106,20 +120,29 @@ static void set_ak4396_params(struct oxygen *chip,
         struct hifier_data *data = chip->model_data;
         u8 value;
 
-        value = data->ak4396_ctl2 & ~AK4396_DFS_MASK;
+        value = data->ak4396_regs[AK4396_CONTROL_2] & ~AK4396_DFS_MASK;
         if (params_rate(params) <= 54000)
                 value |= AK4396_DFS_NORMAL;
         else if (params_rate(params) <= 108000)
                 value |= AK4396_DFS_DOUBLE;
         else
                 value |= AK4396_DFS_QUAD;
-        data->ak4396_ctl2 = value;
 
         msleep(1); /* wait for the new MCLK to become stable */
 
-        ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB);
-        ak4396_write(chip, AK4396_CONTROL_2, value);
-        ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
+        if (value != data->ak4396_regs[AK4396_CONTROL_2]) {
+                ak4396_write(chip, AK4396_CONTROL_1,
+                             AK4396_DIF_24_MSB);
+                ak4396_write(chip, AK4396_CONTROL_2, value);
+                ak4396_write(chip, AK4396_CONTROL_1,
+                             AK4396_DIF_24_MSB | AK4396_RSTN);
+        }
+}
+
+static void update_ak4396_volume(struct oxygen *chip)
+{
+        ak4396_write_cached(chip, AK4396_LCH_ATT, chip->dac_volume[0]);
+        ak4396_write_cached(chip, AK4396_RCH_ATT, chip->dac_volume[1]);
 }
 
 static void update_ak4396_mute(struct oxygen *chip)
@@ -127,11 +150,10 @@ static void update_ak4396_mute(struct oxygen *chip)
         struct hifier_data *data = chip->model_data;
         u8 value;
 
-        value = data->ak4396_ctl2 & ~AK4396_SMUTE;
+        value = data->ak4396_regs[AK4396_CONTROL_2] & ~AK4396_SMUTE;
         if (chip->dac_mute)
                 value |= AK4396_SMUTE;
-        data->ak4396_ctl2 = value;
-        ak4396_write(chip, AK4396_CONTROL_2, value);
+        ak4396_write_cached(chip, AK4396_CONTROL_2, value);
 }
 
 static void set_cs5340_params(struct oxygen *chip,
@@ -141,21 +163,14 @@ static void set_cs5340_params(struct oxygen *chip,
 
 static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
 
-static int hifier_control_filter(struct snd_kcontrol_new *template)
-{
-        if (!strcmp(template->name, "Stereo Upmixing"))
-                return 1; /* stereo only - we don't need upmixing */
-        return 0;
-}
-
 static const struct oxygen_model model_hifier = {
         .shortname = "C-Media CMI8787",
         .longname = "C-Media Oxygen HD Audio",
         .chip = "CMI8788",
         .init = hifier_init,
-        .control_filter = hifier_control_filter,
         .cleanup = hifier_cleanup,
         .resume = hifier_resume,
+        .get_i2s_mclk = oxygen_default_i2s_mclk,
         .set_dac_params = set_ak4396_params,
         .set_adc_params = set_cs5340_params,
         .update_dac_volume = update_ak4396_volume,
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 72db4c39007f..289cb4dacfc7 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -18,6 +18,8 @@
  */
 
 /*
+ * CMI8788:
+ *
  * SPI 0 -> 1st AK4396 (front)
  * SPI 1 -> 2nd AK4396 (surround)
  * SPI 2 -> 3rd AK4396 (center/LFE)
@@ -27,6 +29,10 @@
  * GPIO 0 -> DFS0 of AK5385
  * GPIO 1 -> DFS1 of AK5385
  * GPIO 8 -> enable headphone amplifier on HT-Omega models
+ *
+ * CM9780:
+ *
+ * GPO 0 -> route line-in (0) or AC97 output (1) to ADC input
  */
 
 #include <linux/delay.h>
@@ -66,7 +72,7 @@ enum {
         MODEL_CLARO_HALO,       /* HT-Omega Claro halo */
 };
 
-static struct pci_device_id oxygen_ids[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
         { OXYGEN_PCI_SUBID(0x10b0, 0x0216), .driver_data = MODEL_CMEDIA_REF },
         { OXYGEN_PCI_SUBID(0x10b0, 0x0218), .driver_data = MODEL_CMEDIA_REF },
         { OXYGEN_PCI_SUBID(0x10b0, 0x0219), .driver_data = MODEL_CMEDIA_REF },
@@ -91,8 +97,8 @@ MODULE_DEVICE_TABLE(pci, oxygen_ids);
 #define GPIO_CLARO_HP           0x0100
 
 struct generic_data {
-        u8 ak4396_ctl2;
-        u16 saved_wm8785_registers[2];
+        u8 ak4396_regs[4][5];
+        u16 wm8785_regs[3];
 };
 
 static void ak4396_write(struct oxygen *chip, unsigned int codec,
@@ -102,12 +108,24 @@ static void ak4396_write(struct oxygen *chip, unsigned int codec,
         static const u8 codec_spi_map[4] = {
                 0, 1, 2, 4
         };
+        struct generic_data *data = chip->model_data;
+
         oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
                          OXYGEN_SPI_DATA_LENGTH_2 |
                          OXYGEN_SPI_CLOCK_160 |
                          (codec_spi_map[codec] << OXYGEN_SPI_CODEC_SHIFT) |
                          OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
                          AK4396_WRITE | (reg << 8) | value);
+        data->ak4396_regs[codec][reg] = value;
+}
+
+static void ak4396_write_cached(struct oxygen *chip, unsigned int codec,
+                                u8 reg, u8 value)
+{
+        struct generic_data *data = chip->model_data;
+
+        if (value != data->ak4396_regs[codec][reg])
+                ak4396_write(chip, codec, reg, value);
 }
 
 static void wm8785_write(struct oxygen *chip, u8 reg, unsigned int value)
@@ -120,20 +138,8 @@ static void wm8785_write(struct oxygen *chip, u8 reg, unsigned int value)
                          (3 << OXYGEN_SPI_CODEC_SHIFT) |
                          OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
                          (reg << 9) | value);
-        if (reg < ARRAY_SIZE(data->saved_wm8785_registers))
-                data->saved_wm8785_registers[reg] = value;
-}
-
-static void update_ak4396_volume(struct oxygen *chip)
-{
-        unsigned int i;
-
-        for (i = 0; i < 4; ++i) {
-                ak4396_write(chip, i,
-                             AK4396_LCH_ATT, chip->dac_volume[i * 2]);
-                ak4396_write(chip, i,
-                             AK4396_RCH_ATT, chip->dac_volume[i * 2 + 1]);
-        }
+        if (reg < ARRAY_SIZE(data->wm8785_regs))
+                data->wm8785_regs[reg] = value;
 }
 
 static void ak4396_registers_init(struct oxygen *chip)
@@ -142,21 +148,25 @@ static void ak4396_registers_init(struct oxygen *chip)
         unsigned int i;
 
         for (i = 0; i < 4; ++i) {
-                ak4396_write(chip, i,
-                             AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
-                ak4396_write(chip, i,
-                             AK4396_CONTROL_2, data->ak4396_ctl2);
-                ak4396_write(chip, i,
-                             AK4396_CONTROL_3, AK4396_PCM);
+                ak4396_write(chip, i, AK4396_CONTROL_1,
+                             AK4396_DIF_24_MSB | AK4396_RSTN);
+                ak4396_write(chip, i, AK4396_CONTROL_2,
+                             data->ak4396_regs[0][AK4396_CONTROL_2]);
+                ak4396_write(chip, i, AK4396_CONTROL_3,
+                             AK4396_PCM);
+                ak4396_write(chip, i, AK4396_LCH_ATT,
+                             chip->dac_volume[i * 2]);
+                ak4396_write(chip, i, AK4396_RCH_ATT,
+                             chip->dac_volume[i * 2 + 1]);
         }
-        update_ak4396_volume(chip);
 }
 
 static void ak4396_init(struct oxygen *chip)
 {
         struct generic_data *data = chip->model_data;
 
-        data->ak4396_ctl2 = AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
+        data->ak4396_regs[0][AK4396_CONTROL_2] =
+                AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
         ak4396_registers_init(chip);
         snd_component_add(chip->card, "AK4396");
 }
@@ -173,17 +183,17 @@ static void wm8785_registers_init(struct oxygen *chip)
         struct generic_data *data = chip->model_data;
 
         wm8785_write(chip, WM8785_R7, 0);
-        wm8785_write(chip, WM8785_R0, data->saved_wm8785_registers[0]);
-        wm8785_write(chip, WM8785_R1, data->saved_wm8785_registers[1]);
+        wm8785_write(chip, WM8785_R0, data->wm8785_regs[0]);
+        wm8785_write(chip, WM8785_R2, data->wm8785_regs[2]);
 }
 
 static void wm8785_init(struct oxygen *chip)
 {
         struct generic_data *data = chip->model_data;
 
-        data->saved_wm8785_registers[0] = WM8785_MCR_SLAVE |
-                WM8785_OSR_SINGLE | WM8785_FORMAT_LJUST;
-        data->saved_wm8785_registers[1] = WM8785_WL_24;
+        data->wm8785_regs[0] =
+                WM8785_MCR_SLAVE | WM8785_OSR_SINGLE | WM8785_FORMAT_LJUST;
+        data->wm8785_regs[2] = WM8785_HPFR | WM8785_HPFL;
         wm8785_registers_init(chip);
         snd_component_add(chip->card, "WM8785");
 }
@@ -264,24 +274,36 @@ static void set_ak4396_params(struct oxygen *chip,
         unsigned int i;
         u8 value;
 
-        value = data->ak4396_ctl2 & ~AK4396_DFS_MASK;
+        value = data->ak4396_regs[0][AK4396_CONTROL_2] & ~AK4396_DFS_MASK;
         if (params_rate(params) <= 54000)
                 value |= AK4396_DFS_NORMAL;
         else if (params_rate(params) <= 108000)
                 value |= AK4396_DFS_DOUBLE;
         else
                 value |= AK4396_DFS_QUAD;
-        data->ak4396_ctl2 = value;
 
         msleep(1); /* wait for the new MCLK to become stable */
 
+        if (value != data->ak4396_regs[0][AK4396_CONTROL_2]) {
+                for (i = 0; i < 4; ++i) {
+                        ak4396_write(chip, i, AK4396_CONTROL_1,
+                                     AK4396_DIF_24_MSB);
+                        ak4396_write(chip, i, AK4396_CONTROL_2, value);
+                        ak4396_write(chip, i, AK4396_CONTROL_1,
+                                     AK4396_DIF_24_MSB | AK4396_RSTN);
+                }
+        }
+}
+
+static void update_ak4396_volume(struct oxygen *chip)
+{
+        unsigned int i;
+
         for (i = 0; i < 4; ++i) {
-                ak4396_write(chip, i,
-                             AK4396_CONTROL_1, AK4396_DIF_24_MSB);
-                ak4396_write(chip, i,
-                             AK4396_CONTROL_2, value);
-                ak4396_write(chip, i,
-                             AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
+                ak4396_write_cached(chip, i, AK4396_LCH_ATT,
+                                    chip->dac_volume[i * 2]);
+                ak4396_write_cached(chip, i, AK4396_RCH_ATT,
+                                    chip->dac_volume[i * 2 + 1]);
         }
 }
 
@@ -291,21 +313,19 @@ static void update_ak4396_mute(struct oxygen *chip)
         unsigned int i;
         u8 value;
 
-        value = data->ak4396_ctl2 & ~AK4396_SMUTE;
+        value = data->ak4396_regs[0][AK4396_CONTROL_2] & ~AK4396_SMUTE;
         if (chip->dac_mute)
                 value |= AK4396_SMUTE;
-        data->ak4396_ctl2 = value;
         for (i = 0; i < 4; ++i)
-                ak4396_write(chip, i, AK4396_CONTROL_2, value);
+                ak4396_write_cached(chip, i, AK4396_CONTROL_2, value);
 }
 
 static void set_wm8785_params(struct oxygen *chip,
                               struct snd_pcm_hw_params *params)
 {
+        struct generic_data *data = chip->model_data;
         unsigned int value;
 
-        wm8785_write(chip, WM8785_R7, 0);
-
         value = WM8785_MCR_SLAVE | WM8785_FORMAT_LJUST;
         if (params_rate(params) <= 48000)
                 value |= WM8785_OSR_SINGLE;
@@ -313,13 +333,11 @@ static void set_wm8785_params(struct oxygen *chip,
                 value |= WM8785_OSR_DOUBLE;
         else
                 value |= WM8785_OSR_QUAD;
-        wm8785_write(chip, WM8785_R0, value);
-
-        if (snd_pcm_format_width(params_format(params)) <= 16)
-                value = WM8785_WL_16;
-        else
-                value = WM8785_WL_24;
-        wm8785_write(chip, WM8785_R1, value);
+        if (value != data->wm8785_regs[0]) {
+                wm8785_write(chip, WM8785_R7, 0);
+                wm8785_write(chip, WM8785_R0, value);
+                wm8785_write(chip, WM8785_R2, data->wm8785_regs[2]);
+        }
 }
 
 static void set_ak5385_params(struct oxygen *chip,
@@ -337,6 +355,134 @@ static void set_ak5385_params(struct oxygen *chip,
                               value, GPIO_AK5385_DFS_MASK);
 }
 
+static int rolloff_info(struct snd_kcontrol *ctl,
+                        struct snd_ctl_elem_info *info)
+{
+        static const char *const names[2] = {
+                "Sharp Roll-off", "Slow Roll-off"
+        };
+
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = 1;
+        info->value.enumerated.items = 2;
+        if (info->value.enumerated.item >= 2)
+                info->value.enumerated.item = 1;
+        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
+        return 0;
+}
+
+static int rolloff_get(struct snd_kcontrol *ctl,
+                       struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct generic_data *data = chip->model_data;
+
+        value->value.enumerated.item[0] =
+                (data->ak4396_regs[0][AK4396_CONTROL_2] & AK4396_SLOW) != 0;
+        return 0;
+}
+
+static int rolloff_put(struct snd_kcontrol *ctl,
+                       struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct generic_data *data = chip->model_data;
+        unsigned int i;
+        int changed;
+        u8 reg;
+
+        mutex_lock(&chip->mutex);
+        reg = data->ak4396_regs[0][AK4396_CONTROL_2];
+        if (value->value.enumerated.item[0])
+                reg |= AK4396_SLOW;
+        else
+                reg &= ~AK4396_SLOW;
+        changed = reg != data->ak4396_regs[0][AK4396_CONTROL_2];
+        if (changed) {
+                for (i = 0; i < 4; ++i)
+                        ak4396_write(chip, i, AK4396_CONTROL_2, reg);
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static const struct snd_kcontrol_new rolloff_control = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "DAC Filter Playback Enum",
+        .info = rolloff_info,
+        .get = rolloff_get,
+        .put = rolloff_put,
+};
+
+static int hpf_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
+{
+        static const char *const names[2] = {
+                "None", "High-pass Filter"
+        };
+
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = 1;
+        info->value.enumerated.items = 2;
+        if (info->value.enumerated.item >= 2)
+                info->value.enumerated.item = 1;
+        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
+        return 0;
+}
+
+static int hpf_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct generic_data *data = chip->model_data;
+
+        value->value.enumerated.item[0] =
+                (data->wm8785_regs[WM8785_R2] & WM8785_HPFR) != 0;
+        return 0;
+}
+
+static int hpf_put(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct generic_data *data = chip->model_data;
+        unsigned int reg;
+        int changed;
+
+        mutex_lock(&chip->mutex);
+        reg = data->wm8785_regs[WM8785_R2] & ~(WM8785_HPFR | WM8785_HPFL);
+        if (value->value.enumerated.item[0])
+                reg |= WM8785_HPFR | WM8785_HPFL;
+        changed = reg != data->wm8785_regs[WM8785_R2];
+        if (changed)
+                wm8785_write(chip, WM8785_R2, reg);
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static const struct snd_kcontrol_new hpf_control = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "ADC Filter Capture Enum",
+        .info = hpf_info,
+        .get = hpf_get,
+        .put = hpf_put,
+};
+
+static int generic_mixer_init(struct oxygen *chip)
+{
+        return snd_ctl_add(chip->card, snd_ctl_new1(&rolloff_control, chip));
+}
+
+static int generic_wm8785_mixer_init(struct oxygen *chip)
+{
+        int err;
+
+        err = generic_mixer_init(chip);
+        if (err < 0)
+                return err;
+        err = snd_ctl_add(chip->card, snd_ctl_new1(&hpf_control, chip));
+        if (err < 0)
+                return err;
+        return 0;
+}
+
 static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
 
 static const struct oxygen_model model_generic = {
@@ -344,8 +490,10 @@ static const struct oxygen_model model_generic = {
         .longname = "C-Media Oxygen HD Audio",
         .chip = "CMI8788",
         .init = generic_init,
+        .mixer_init = generic_wm8785_mixer_init,
         .cleanup = generic_cleanup,
         .resume = generic_resume,
+        .get_i2s_mclk = oxygen_default_i2s_mclk,
         .set_dac_params = set_ak4396_params,
         .set_adc_params = set_wm8785_params,
         .update_dac_volume = update_ak4396_volume,
@@ -374,6 +522,7 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
         switch (id->driver_data) {
         case MODEL_MERIDIAN:
                 chip->model.init = meridian_init;
+                chip->model.mixer_init = generic_mixer_init;
                 chip->model.resume = meridian_resume;
                 chip->model.set_adc_params = set_ak5385_params;
                 chip->model.device_config = PLAYBACK_0_TO_I2S |
@@ -389,6 +538,7 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
                 break;
         case MODEL_CLARO_HALO:
                 chip->model.init = claro_halo_init;
+                chip->model.mixer_init = generic_mixer_init;
                 chip->model.cleanup = claro_cleanup;
                 chip->model.suspend = claro_suspend;
                 chip->model.resume = claro_resume;
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h
index bd615dbffadb..6147216af744 100644
--- a/sound/pci/oxygen/oxygen.h
+++ b/sound/pci/oxygen/oxygen.h
@@ -78,12 +78,15 @@ struct oxygen_model {
         void (*resume)(struct oxygen *chip);
         void (*pcm_hardware_filter)(unsigned int channel,
                                     struct snd_pcm_hardware *hardware);
+        unsigned int (*get_i2s_mclk)(struct oxygen *chip, unsigned int channel,
+                                     struct snd_pcm_hw_params *hw_params);
         void (*set_dac_params)(struct oxygen *chip,
                                struct snd_pcm_hw_params *params);
         void (*set_adc_params)(struct oxygen *chip,
                                struct snd_pcm_hw_params *params);
         void (*update_dac_volume)(struct oxygen *chip);
         void (*update_dac_mute)(struct oxygen *chip);
+        void (*update_center_lfe_mix)(struct oxygen *chip, bool mixed);
         void (*gpio_changed)(struct oxygen *chip);
         void (*uart_input)(struct oxygen *chip);
         void (*ac97_switch)(struct oxygen *chip,
@@ -162,6 +165,8 @@ void oxygen_update_spdif_source(struct oxygen *chip);
 /* oxygen_pcm.c */
 
 int oxygen_pcm_init(struct oxygen *chip);
+unsigned int oxygen_default_i2s_mclk(struct oxygen *chip, unsigned int channel,
+                                     struct snd_pcm_hw_params *hw_params);
 
 /* oxygen_io.c */
 
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 9a8936e20744..fad03d64e3ad 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <sound/ac97_codec.h>
 #include <sound/asoundef.h>
 #include <sound/core.h>
@@ -278,7 +279,11 @@ oxygen_search_pci_id(struct oxygen *chip, const struct pci_device_id ids[])
 static void oxygen_restore_eeprom(struct oxygen *chip,
                                   const struct pci_device_id *id)
 {
-        if (oxygen_read_eeprom(chip, 0) != OXYGEN_EEPROM_ID) {
+        u16 eeprom_id;
+
+        eeprom_id = oxygen_read_eeprom(chip, 0);
+        if (eeprom_id != OXYGEN_EEPROM_ID &&
+            (eeprom_id != 0xffff || id->subdevice != 0x8788)) {
                 /*
                  * This function gets called only when a known card model has
                  * been detected, i.e., we know there is a valid subsystem
@@ -303,6 +308,28 @@ static void oxygen_restore_eeprom(struct oxygen *chip,
         }
 }
 
+static void pci_bridge_magic(void)
+{
+        struct pci_dev *pci = NULL;
+        u32 tmp;
+
+        for (;;) {
+                /* If there is any Pericom PI7C9X110 PCI-E/PCI bridge ... */
+                pci = pci_get_device(0x12d8, 0xe110, pci);
+                if (!pci)
+                        break;
+                /*
+                 * ... configure its secondary internal arbiter to park to
+                 * the secondary port, instead of to the last master.
+                 */
+                if (!pci_read_config_dword(pci, 0x40, &tmp)) {
+                        tmp |= 1;
+                        pci_write_config_dword(pci, 0x40, tmp);
+                }
+                /* Why?  Try asking C-Media. */
+        }
+}
+
 static void oxygen_init(struct oxygen *chip)
 {
         unsigned int i;
@@ -581,6 +608,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
         snd_card_set_dev(card, &pci->dev);
         card->private_free = oxygen_card_free;
 
+        pci_bridge_magic();
         oxygen_init(chip);
         chip->model.init(chip);
 
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index 5401c547c4e3..f375b8a27862 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -99,11 +99,15 @@ static int dac_mute_put(struct snd_kcontrol *ctl,
 
 static int upmix_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
 {
-        static const char *const names[3] = {
-                "Front", "Front+Surround", "Front+Surround+Back"
+        static const char *const names[5] = {
+                "Front",
+                "Front+Surround",
+                "Front+Surround+Back",
+                "Front+Surround+Center/LFE",
+                "Front+Surround+Center/LFE+Back",
         };
         struct oxygen *chip = ctl->private_data;
-        unsigned int count = 2 + (chip->model.dac_channels == 8);
+        unsigned int count = chip->model.update_center_lfe_mix ? 5 : 3;
 
         info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         info->count = 1;
@@ -127,7 +131,7 @@ static int upmix_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
 void oxygen_update_dac_routing(struct oxygen *chip)
 {
         /* DAC 0: front, DAC 1: surround, DAC 2: center/LFE, DAC 3: back */
-        static const unsigned int reg_values[3] = {
+        static const unsigned int reg_values[5] = {
                 /* stereo -> front */
                 (0 << OXYGEN_PLAY_DAC0_SOURCE_SHIFT) |
                 (1 << OXYGEN_PLAY_DAC1_SOURCE_SHIFT) |
@@ -143,6 +147,16 @@ void oxygen_update_dac_routing(struct oxygen *chip)
                 (0 << OXYGEN_PLAY_DAC1_SOURCE_SHIFT) |
                 (2 << OXYGEN_PLAY_DAC2_SOURCE_SHIFT) |
                 (0 << OXYGEN_PLAY_DAC3_SOURCE_SHIFT),
+                /* stereo -> front+surround+center/LFE */
+                (0 << OXYGEN_PLAY_DAC0_SOURCE_SHIFT) |
+                (0 << OXYGEN_PLAY_DAC1_SOURCE_SHIFT) |
+                (0 << OXYGEN_PLAY_DAC2_SOURCE_SHIFT) |
+                (3 << OXYGEN_PLAY_DAC3_SOURCE_SHIFT),
+                /* stereo -> front+surround+center/LFE+back */
+                (0 << OXYGEN_PLAY_DAC0_SOURCE_SHIFT) |
+                (0 << OXYGEN_PLAY_DAC1_SOURCE_SHIFT) |
+                (0 << OXYGEN_PLAY_DAC2_SOURCE_SHIFT) |
+                (0 << OXYGEN_PLAY_DAC3_SOURCE_SHIFT),
         };
         u8 channels;
         unsigned int reg_value;
@@ -167,22 +181,23 @@ void oxygen_update_dac_routing(struct oxygen *chip)
                               OXYGEN_PLAY_DAC1_SOURCE_MASK |
                               OXYGEN_PLAY_DAC2_SOURCE_MASK |
                               OXYGEN_PLAY_DAC3_SOURCE_MASK);
+        if (chip->model.update_center_lfe_mix)
+                chip->model.update_center_lfe_mix(chip, chip->dac_routing > 2);
 }
 
 static int upmix_put(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
 {
         struct oxygen *chip = ctl->private_data;
-        unsigned int count = 2 + (chip->model.dac_channels == 8);
+        unsigned int count = chip->model.update_center_lfe_mix ? 5 : 3;
         int changed;
 
+        if (value->value.enumerated.item[0] >= count)
+                return -EINVAL;
         mutex_lock(&chip->mutex);
         changed = value->value.enumerated.item[0] != chip->dac_routing;
         if (changed) {
-                chip->dac_routing = min(value->value.enumerated.item[0],
-                                        count - 1);
-                spin_lock_irq(&chip->reg_lock);
+                chip->dac_routing = value->value.enumerated.item[0];
                 oxygen_update_dac_routing(chip);
-                spin_unlock_irq(&chip->reg_lock);
         }
         mutex_unlock(&chip->mutex);
         return changed;
@@ -790,7 +805,7 @@ static const struct {
                 .controls = {
                         {
                                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                                .name = "Analog Input Monitor Switch",
+                                .name = "Analog Input Monitor Playback Switch",
                                 .info = snd_ctl_boolean_mono_info,
                                 .get = monitor_get,
                                 .put = monitor_put,
@@ -798,7 +813,7 @@ static const struct {
                         },
                         {
                                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                                .name = "Analog Input Monitor Volume",
+                                .name = "Analog Input Monitor Playback Volume",
                                 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                           SNDRV_CTL_ELEM_ACCESS_TLV_READ,
                                 .info = monitor_volume_info,
@@ -815,7 +830,7 @@ static const struct {
                 .controls = {
                         {
                                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                                .name = "Analog Input Monitor Switch",
+                                .name = "Analog Input Monitor Playback Switch",
                                 .info = snd_ctl_boolean_mono_info,
                                 .get = monitor_get,
                                 .put = monitor_put,
@@ -823,7 +838,7 @@ static const struct {
                         },
                         {
                                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                                .name = "Analog Input Monitor Volume",
+                                .name = "Analog Input Monitor Playback Volume",
                                 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                           SNDRV_CTL_ELEM_ACCESS_TLV_READ,
                                 .info = monitor_volume_info,
@@ -840,7 +855,7 @@ static const struct {
                 .controls = {
                         {
                                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                                .name = "Analog Input Monitor Switch",
+                                .name = "Analog Input Monitor Playback Switch",
                                 .index = 1,
                                 .info = snd_ctl_boolean_mono_info,
                                 .get = monitor_get,
@@ -849,7 +864,7 @@ static const struct {
                         },
                         {
                                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                                .name = "Analog Input Monitor Volume",
+                                .name = "Analog Input Monitor Playback Volume",
                                 .index = 1,
                                 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                           SNDRV_CTL_ELEM_ACCESS_TLV_READ,
@@ -867,7 +882,7 @@ static const struct {
                 .controls = {
                         {
                                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                                .name = "Digital Input Monitor Switch",
+                                .name = "Digital Input Monitor Playback Switch",
                                 .info = snd_ctl_boolean_mono_info,
                                 .get = monitor_get,
                                 .put = monitor_put,
@@ -875,7 +890,7 @@ static const struct {
                         },
                         {
                                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                                .name = "Digital Input Monitor Volume",
+                                .name = "Digital Input Monitor Playback Volume",
                                 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                           SNDRV_CTL_ELEM_ACCESS_TLV_READ,
                                 .info = monitor_volume_info,
@@ -954,6 +969,9 @@ static int add_controls(struct oxygen *chip,
                         if (err == 1)
                                 continue;
                 }
+                if (!strcmp(template.name, "Stereo Upmixing") &&
+                    chip->model.dac_channels == 2)
+                        continue;
                 if (!strcmp(template.name, "Master Playback Volume") &&
                     chip->model.dac_tlv) {
                         template.tlv.p = chip->model.dac_tlv;
diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c
index ef2345d82b86..9dff6954c397 100644
--- a/sound/pci/oxygen/oxygen_pcm.c
+++ b/sound/pci/oxygen/oxygen_pcm.c
@@ -271,13 +271,16 @@ static unsigned int oxygen_rate(struct snd_pcm_hw_params *hw_params)
         }
 }
 
-static unsigned int oxygen_i2s_mclk(struct snd_pcm_hw_params *hw_params)
+unsigned int oxygen_default_i2s_mclk(struct oxygen *chip,
+                                     unsigned int channel,
+                                     struct snd_pcm_hw_params *hw_params)
 {
         if (params_rate(hw_params) <= 96000)
                 return OXYGEN_I2S_MCLK_256;
         else
                 return OXYGEN_I2S_MCLK_128;
 }
+EXPORT_SYMBOL(oxygen_default_i2s_mclk);
 
 static unsigned int oxygen_i2s_bits(struct snd_pcm_hw_params *hw_params)
 {
@@ -354,7 +357,7 @@ static int oxygen_rec_a_hw_params(struct snd_pcm_substream *substream,
                              OXYGEN_REC_FORMAT_A_MASK);
         oxygen_write16_masked(chip, OXYGEN_I2S_A_FORMAT,
                               oxygen_rate(hw_params) |
-                              oxygen_i2s_mclk(hw_params) |
+                              chip->model.get_i2s_mclk(chip, PCM_A, hw_params) |
                               chip->model.adc_i2s_format |
                               oxygen_i2s_bits(hw_params),
                               OXYGEN_I2S_RATE_MASK |
@@ -390,7 +393,8 @@ static int oxygen_rec_b_hw_params(struct snd_pcm_substream *substream,
         if (!is_ac97)
                 oxygen_write16_masked(chip, OXYGEN_I2S_B_FORMAT,
                                       oxygen_rate(hw_params) |
-                                      oxygen_i2s_mclk(hw_params) |
+                                      chip->model.get_i2s_mclk(chip, PCM_B,
+                                                               hw_params) |
                                       chip->model.adc_i2s_format |
                                       oxygen_i2s_bits(hw_params),
                                       OXYGEN_I2S_RATE_MASK |
@@ -435,6 +439,7 @@ static int oxygen_spdif_hw_params(struct snd_pcm_substream *substream,
         if (err < 0)
                 return err;
 
+        mutex_lock(&chip->mutex);
         spin_lock_irq(&chip->reg_lock);
         oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL,
                             OXYGEN_SPDIF_OUT_ENABLE);
@@ -446,6 +451,7 @@ static int oxygen_spdif_hw_params(struct snd_pcm_substream *substream,
                               OXYGEN_SPDIF_OUT_RATE_MASK);
         oxygen_update_spdif_source(chip);
         spin_unlock_irq(&chip->reg_lock);
+        mutex_unlock(&chip->mutex);
         return 0;
 }
 
@@ -459,6 +465,7 @@ static int oxygen_multich_hw_params(struct snd_pcm_substream *substream,
         if (err < 0)
                 return err;
 
+        mutex_lock(&chip->mutex);
         spin_lock_irq(&chip->reg_lock);
         oxygen_write8_masked(chip, OXYGEN_PLAY_CHANNELS,
                              oxygen_play_channels(hw_params),
@@ -469,18 +476,18 @@ static int oxygen_multich_hw_params(struct snd_pcm_substream *substream,
         oxygen_write16_masked(chip, OXYGEN_I2S_MULTICH_FORMAT,
                               oxygen_rate(hw_params) |
                               chip->model.dac_i2s_format |
-                              oxygen_i2s_mclk(hw_params) |
+                              chip->model.get_i2s_mclk(chip, PCM_MULTICH,
+                                                       hw_params) |
                               oxygen_i2s_bits(hw_params),
                               OXYGEN_I2S_RATE_MASK |
                               OXYGEN_I2S_FORMAT_MASK |
                               OXYGEN_I2S_MCLK_MASK |
                               OXYGEN_I2S_BITS_MASK);
-        oxygen_update_dac_routing(chip);
         oxygen_update_spdif_source(chip);
         spin_unlock_irq(&chip->reg_lock);
 
-        mutex_lock(&chip->mutex);
         chip->model.set_dac_params(chip, hw_params);
+        oxygen_update_dac_routing(chip);
         mutex_unlock(&chip->mutex);
         return 0;
 }
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 6ebcb6bdd712..f03a2f2cffee 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -17,145 +17,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-/*
- * Xonar D2/D2X
- * ------------
- *
- * CMI8788:
- *
- * SPI 0 -> 1st PCM1796 (front)
- * SPI 1 -> 2nd PCM1796 (surround)
- * SPI 2 -> 3rd PCM1796 (center/LFE)
- * SPI 4 -> 4th PCM1796 (back)
- *
- * GPIO 2 -> M0 of CS5381
- * GPIO 3 -> M1 of CS5381
- * GPIO 5 <- external power present (D2X only)
- * GPIO 7 -> ALT
- * GPIO 8 -> enable output to speakers
- */
-
-/*
- * Xonar D1/DX
- * -----------
- *
- * CMI8788:
- *
- * I²C <-> CS4398 (front)
- *     <-> CS4362A (surround, center/LFE, back)
- *
- * GPI 0 <- external power present (DX only)
- *
- * GPIO 0 -> enable output to speakers
- * GPIO 1 -> enable front panel I/O
- * GPIO 2 -> M0 of CS5361
- * GPIO 3 -> M1 of CS5361
- * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
- *
- * CS4398:
- *
- * AD0 <- 1
- * AD1 <- 1
- *
- * CS4362A:
- *
- * AD0 <- 0
- */
-
-/*
- * Xonar HDAV1.3 (Deluxe)
- * ----------------------
- *
- * CMI8788:
- *
- * I²C <-> PCM1796 (front)
- *
- * GPI 0 <- external power present
- *
- * GPIO 0 -> enable output to speakers
- * GPIO 2 -> M0 of CS5381
- * GPIO 3 -> M1 of CS5381
- * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
- *
- * TXD -> HDMI controller
- * RXD <- HDMI controller
- *
- * PCM1796 front: AD1,0 <- 0,0
- *
- * no daughterboard
- * ----------------
- *
- * GPIO 4 <- 1
- *
- * H6 daughterboard
- * ----------------
- *
- * GPIO 4 <- 0
- * GPIO 5 <- 0
- *
- * I²C <-> PCM1796 (surround)
- *     <-> PCM1796 (center/LFE)
- *     <-> PCM1796 (back)
- *
- * PCM1796 surround:   AD1,0 <- 0,1
- * PCM1796 center/LFE: AD1,0 <- 1,0
- * PCM1796 back:       AD1,0 <- 1,1
- *
- * unknown daughterboard
- * ---------------------
- *
- * GPIO 4 <- 0
- * GPIO 5 <- 1
- *
- * I²C <-> CS4362A (surround, center/LFE, back)
- *
- * CS4362A: AD0 <- 0
- */
-
-/*
- * Xonar Essence ST (Deluxe)/STX
- * -----------------------------
- *
- * CMI8788:
- *
- * I²C <-> PCM1792A
- *
- * GPI 0 <- external power present
- *
- * GPIO 0 -> enable output to speakers
- * GPIO 1 -> route HP to front panel (0) or rear jack (1)
- * GPIO 2 -> M0 of CS5381
- * GPIO 3 -> M1 of CS5381
- * GPIO 7 -> route output to speaker jacks (0) or HP (1)
- * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
- *
- * PCM1792A:
- *
- * AD0 <- 0
- *
- * H6 daughterboard
- * ----------------
- *
- * GPIO 4 <- 0
- * GPIO 5 <- 0
- */
-
 #include <linux/pci.h>
 #include <linux/delay.h>
-#include <linux/mutex.h>
-#include <sound/ac97_codec.h>
-#include <sound/asoundef.h>
-#include <sound/control.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/tlv.h>
-#include "oxygen.h"
-#include "cm9780.h"
-#include "pcm1796.h"
-#include "cs4398.h"
-#include "cs4362a.h"
+#include "xonar.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("Asus AVx00 driver");
@@ -173,972 +40,31 @@ MODULE_PARM_DESC(id, "ID string");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "enable card");
 
-enum {
-        MODEL_D2,
-        MODEL_D2X,
-        MODEL_D1,
-        MODEL_DX,
-        MODEL_HDAV,     /* without daughterboard */
-        MODEL_HDAV_H6,  /* with H6 daughterboard */
-        MODEL_ST,
-        MODEL_ST_H6,
-        MODEL_STX,
-};
-
-static struct pci_device_id xonar_ids[] __devinitdata = {
-        { OXYGEN_PCI_SUBID(0x1043, 0x8269), .driver_data = MODEL_D2 },
-        { OXYGEN_PCI_SUBID(0x1043, 0x8275), .driver_data = MODEL_DX },
-        { OXYGEN_PCI_SUBID(0x1043, 0x82b7), .driver_data = MODEL_D2X },
-        { OXYGEN_PCI_SUBID(0x1043, 0x8314), .driver_data = MODEL_HDAV },
-        { OXYGEN_PCI_SUBID(0x1043, 0x8327), .driver_data = MODEL_DX },
-        { OXYGEN_PCI_SUBID(0x1043, 0x834f), .driver_data = MODEL_D1 },
-        { OXYGEN_PCI_SUBID(0x1043, 0x835c), .driver_data = MODEL_STX },
-        { OXYGEN_PCI_SUBID(0x1043, 0x835d), .driver_data = MODEL_ST },
+static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = {
+        { OXYGEN_PCI_SUBID(0x1043, 0x8269) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x8275) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x82b7) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x8314) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x8327) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x834f) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x835c) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x835d) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x838e) },
         { OXYGEN_PCI_SUBID_BROKEN_EEPROM },
         { }
 };
 MODULE_DEVICE_TABLE(pci, xonar_ids);
 
-
-#define GPIO_CS53x1_M_MASK      0x000c
-#define GPIO_CS53x1_M_SINGLE    0x0000
-#define GPIO_CS53x1_M_DOUBLE    0x0004
-#define GPIO_CS53x1_M_QUAD      0x0008
-
-#define GPIO_D2X_EXT_POWER      0x0020
-#define GPIO_D2_ALT             0x0080
-#define GPIO_D2_OUTPUT_ENABLE   0x0100
-
-#define GPI_DX_EXT_POWER        0x01
-#define GPIO_DX_OUTPUT_ENABLE   0x0001
-#define GPIO_DX_FRONT_PANEL     0x0002
-#define GPIO_DX_INPUT_ROUTE     0x0100
-
-#define GPIO_DB_MASK            0x0030
-#define GPIO_DB_H6              0x0000
-#define GPIO_DB_XX              0x0020
-
-#define GPIO_ST_HP_REAR         0x0002
-#define GPIO_ST_HP              0x0080
-
-#define I2C_DEVICE_PCM1796(i)   (0x98 + ((i) << 1))     /* 10011, ADx=i, /W=0 */
-#define I2C_DEVICE_CS4398       0x9e    /* 10011, AD1=1, AD0=1, /W=0 */
-#define I2C_DEVICE_CS4362A      0x30    /* 001100, AD0=0, /W=0 */
-
-struct xonar_data {
-        unsigned int anti_pop_delay;
-        unsigned int dacs;
-        u16 output_enable_bit;
-        u8 ext_power_reg;
-        u8 ext_power_int_reg;
-        u8 ext_power_bit;
-        u8 has_power;
-        u8 pcm1796_oversampling;
-        u8 cs4398_fm;
-        u8 cs4362a_fm;
-        u8 hdmi_params[5];
-};
-
-static void xonar_gpio_changed(struct oxygen *chip);
-
-static inline void pcm1796_write_spi(struct oxygen *chip, unsigned int codec,
-                                     u8 reg, u8 value)
-{
-        /* maps ALSA channel pair number to SPI output */
-        static const u8 codec_map[4] = {
-                0, 1, 2, 4
-        };
-        oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER  |
-                         OXYGEN_SPI_DATA_LENGTH_2 |
-                         OXYGEN_SPI_CLOCK_160 |
-                         (codec_map[codec] << OXYGEN_SPI_CODEC_SHIFT) |
-                         OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
-                         (reg << 8) | value);
-}
-
-static inline void pcm1796_write_i2c(struct oxygen *chip, unsigned int codec,
-                                     u8 reg, u8 value)
-{
-        oxygen_write_i2c(chip, I2C_DEVICE_PCM1796(codec), reg, value);
-}
-
-static void pcm1796_write(struct oxygen *chip, unsigned int codec,
-                          u8 reg, u8 value)
-{
-        if ((chip->model.function_flags & OXYGEN_FUNCTION_2WIRE_SPI_MASK) ==
-            OXYGEN_FUNCTION_SPI)
-                pcm1796_write_spi(chip, codec, reg, value);
-        else
-                pcm1796_write_i2c(chip, codec, reg, value);
-}
-
-static void cs4398_write(struct oxygen *chip, u8 reg, u8 value)
-{
-        oxygen_write_i2c(chip, I2C_DEVICE_CS4398, reg, value);
-}
-
-static void cs4362a_write(struct oxygen *chip, u8 reg, u8 value)
-{
-        oxygen_write_i2c(chip, I2C_DEVICE_CS4362A, reg, value);
-}
-
-static void hdmi_write_command(struct oxygen *chip, u8 command,
-                               unsigned int count, const u8 *params)
-{
-        unsigned int i;
-        u8 checksum;
-
-        oxygen_write_uart(chip, 0xfb);
-        oxygen_write_uart(chip, 0xef);
-        oxygen_write_uart(chip, command);
-        oxygen_write_uart(chip, count);
-        for (i = 0; i < count; ++i)
-                oxygen_write_uart(chip, params[i]);
-        checksum = 0xfb + 0xef + command + count;
-        for (i = 0; i < count; ++i)
-                checksum += params[i];
-        oxygen_write_uart(chip, checksum);
-}
-
-static void xonar_enable_output(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-
-        msleep(data->anti_pop_delay);
-        oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, data->output_enable_bit);
-}
-
-static void xonar_common_init(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-
-        if (data->ext_power_reg) {
-                oxygen_set_bits8(chip, data->ext_power_int_reg,
-                                 data->ext_power_bit);
-                chip->interrupt_mask |= OXYGEN_INT_GPIO;
-                chip->model.gpio_changed = xonar_gpio_changed;
-                data->has_power = !!(oxygen_read8(chip, data->ext_power_reg)
-                                     & data->ext_power_bit);
-        }
-        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
-                          GPIO_CS53x1_M_MASK | data->output_enable_bit);
-        oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
-                              GPIO_CS53x1_M_SINGLE, GPIO_CS53x1_M_MASK);
-        oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC);
-        xonar_enable_output(chip);
-}
-
-static void update_pcm1796_volume(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-        unsigned int i;
-
-        for (i = 0; i < data->dacs; ++i) {
-                pcm1796_write(chip, i, 16, chip->dac_volume[i * 2]);
-                pcm1796_write(chip, i, 17, chip->dac_volume[i * 2 + 1]);
-        }
-}
-
-static void update_pcm1796_mute(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-        unsigned int i;
-        u8 value;
-
-        value = PCM1796_DMF_DISABLED | PCM1796_FMT_24_LJUST | PCM1796_ATLD;
-        if (chip->dac_mute)
-                value |= PCM1796_MUTE;
-        for (i = 0; i < data->dacs; ++i)
-                pcm1796_write(chip, i, 18, value);
-}
-
-static void pcm1796_init(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-        unsigned int i;
-
-        for (i = 0; i < data->dacs; ++i) {
-                pcm1796_write(chip, i, 19, PCM1796_FLT_SHARP | PCM1796_ATS_1);
-                pcm1796_write(chip, i, 20, data->pcm1796_oversampling);
-                pcm1796_write(chip, i, 21, 0);
-        }
-        update_pcm1796_mute(chip); /* set ATLD before ATL/ATR */
-        update_pcm1796_volume(chip);
-}
-
-static void xonar_d2_init(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-
-        data->anti_pop_delay = 300;
-        data->dacs = 4;
-        data->output_enable_bit = GPIO_D2_OUTPUT_ENABLE;
-        data->pcm1796_oversampling = PCM1796_OS_64;
-
-        pcm1796_init(chip);
-
-        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_D2_ALT);
-        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_D2_ALT);
-
-        xonar_common_init(chip);
-
-        snd_component_add(chip->card, "PCM1796");
-        snd_component_add(chip->card, "CS5381");
-}
-
-static void xonar_d2x_init(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-
-        data->ext_power_reg = OXYGEN_GPIO_DATA;
-        data->ext_power_int_reg = OXYGEN_GPIO_INTERRUPT_MASK;
-        data->ext_power_bit = GPIO_D2X_EXT_POWER;
-        oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_D2X_EXT_POWER);
-
-        xonar_d2_init(chip);
-}
-
-static void update_cs4362a_volumes(struct oxygen *chip)
-{
-        u8 mute;
-
-        mute = chip->dac_mute ? CS4362A_MUTE : 0;
-        cs4362a_write(chip, 7, (127 - chip->dac_volume[2]) | mute);
-        cs4362a_write(chip, 8, (127 - chip->dac_volume[3]) | mute);
-        cs4362a_write(chip, 10, (127 - chip->dac_volume[4]) | mute);
-        cs4362a_write(chip, 11, (127 - chip->dac_volume[5]) | mute);
-        cs4362a_write(chip, 13, (127 - chip->dac_volume[6]) | mute);
-        cs4362a_write(chip, 14, (127 - chip->dac_volume[7]) | mute);
-}
-
-static void update_cs43xx_volume(struct oxygen *chip)
-{
-        cs4398_write(chip, 5, (127 - chip->dac_volume[0]) * 2);
-        cs4398_write(chip, 6, (127 - chip->dac_volume[1]) * 2);
-        update_cs4362a_volumes(chip);
-}
-
-static void update_cs43xx_mute(struct oxygen *chip)
-{
-        u8 reg;
-
-        reg = CS4398_MUTEP_LOW | CS4398_PAMUTE;
-        if (chip->dac_mute)
-                reg |= CS4398_MUTE_B | CS4398_MUTE_A;
-        cs4398_write(chip, 4, reg);
-        update_cs4362a_volumes(chip);
-}
-
-static void cs43xx_init(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-
-        /* set CPEN (control port mode) and power down */
-        cs4398_write(chip, 8, CS4398_CPEN | CS4398_PDN);
-        cs4362a_write(chip, 0x01, CS4362A_PDN | CS4362A_CPEN);
-        /* configure */
-        cs4398_write(chip, 2, data->cs4398_fm);
-        cs4398_write(chip, 3, CS4398_ATAPI_B_R | CS4398_ATAPI_A_L);
-        cs4398_write(chip, 7, CS4398_RMP_DN | CS4398_RMP_UP |
-                     CS4398_ZERO_CROSS | CS4398_SOFT_RAMP);
-        cs4362a_write(chip, 0x02, CS4362A_DIF_LJUST);
-        cs4362a_write(chip, 0x03, CS4362A_MUTEC_6 | CS4362A_AMUTE |
-                      CS4362A_RMP_UP | CS4362A_ZERO_CROSS | CS4362A_SOFT_RAMP);
-        cs4362a_write(chip, 0x04, CS4362A_RMP_DN | CS4362A_DEM_NONE);
-        cs4362a_write(chip, 0x05, 0);
-        cs4362a_write(chip, 0x06, data->cs4362a_fm);
-        cs4362a_write(chip, 0x09, data->cs4362a_fm);
-        cs4362a_write(chip, 0x0c, data->cs4362a_fm);
-        update_cs43xx_volume(chip);
-        update_cs43xx_mute(chip);
-        /* clear power down */
-        cs4398_write(chip, 8, CS4398_CPEN);
-        cs4362a_write(chip, 0x01, CS4362A_CPEN);
-}
-
-static void xonar_d1_init(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-
-        data->anti_pop_delay = 800;
-        data->output_enable_bit = GPIO_DX_OUTPUT_ENABLE;
-        data->cs4398_fm = CS4398_FM_SINGLE | CS4398_DEM_NONE | CS4398_DIF_LJUST;
-        data->cs4362a_fm = CS4362A_FM_SINGLE |
-                CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
-
-        oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
-                       OXYGEN_2WIRE_LENGTH_8 |
-                       OXYGEN_2WIRE_INTERRUPT_MASK |
-                       OXYGEN_2WIRE_SPEED_FAST);
-
-        cs43xx_init(chip);
-
-        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
-                          GPIO_DX_FRONT_PANEL | GPIO_DX_INPUT_ROUTE);
-        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
-                            GPIO_DX_FRONT_PANEL | GPIO_DX_INPUT_ROUTE);
-
-        xonar_common_init(chip);
-
-        snd_component_add(chip->card, "CS4398");
-        snd_component_add(chip->card, "CS4362A");
-        snd_component_add(chip->card, "CS5361");
-}
-
-static void xonar_dx_init(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-
-        data->ext_power_reg = OXYGEN_GPI_DATA;
-        data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
-        data->ext_power_bit = GPI_DX_EXT_POWER;
-
-        xonar_d1_init(chip);
-}
-
-static void xonar_hdav_init(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-        u8 param;
-
-        oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
-                       OXYGEN_2WIRE_LENGTH_8 |
-                       OXYGEN_2WIRE_INTERRUPT_MASK |
-                       OXYGEN_2WIRE_SPEED_FAST);
-
-        data->anti_pop_delay = 100;
-        data->dacs = chip->model.private_data == MODEL_HDAV_H6 ? 4 : 1;
-        data->output_enable_bit = GPIO_DX_OUTPUT_ENABLE;
-        data->ext_power_reg = OXYGEN_GPI_DATA;
-        data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
-        data->ext_power_bit = GPI_DX_EXT_POWER;
-        data->pcm1796_oversampling = PCM1796_OS_64;
-
-        pcm1796_init(chip);
-
-        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DX_INPUT_ROUTE);
-        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_DX_INPUT_ROUTE);
-
-        oxygen_reset_uart(chip);
-        param = 0;
-        hdmi_write_command(chip, 0x61, 1, &param);
-        param = 1;
-        hdmi_write_command(chip, 0x74, 1, &param);
-        data->hdmi_params[1] = IEC958_AES3_CON_FS_48000;
-        data->hdmi_params[4] = 1;
-        hdmi_write_command(chip, 0x54, 5, data->hdmi_params);
-
-        xonar_common_init(chip);
-
-        snd_component_add(chip->card, "PCM1796");
-        snd_component_add(chip->card, "CS5381");
-}
-
-static void xonar_st_init(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-
-        oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
-                       OXYGEN_2WIRE_LENGTH_8 |
-                       OXYGEN_2WIRE_INTERRUPT_MASK |
-                       OXYGEN_2WIRE_SPEED_FAST);
-
-        if (chip->model.private_data == MODEL_ST_H6)
-                chip->model.dac_channels = 8;
-        data->anti_pop_delay = 100;
-        data->dacs = chip->model.private_data == MODEL_ST_H6 ? 4 : 1;
-        data->output_enable_bit = GPIO_DX_OUTPUT_ENABLE;
-        data->pcm1796_oversampling = PCM1796_OS_64;
-
-        pcm1796_init(chip);
-
-        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
-                          GPIO_DX_INPUT_ROUTE | GPIO_ST_HP_REAR | GPIO_ST_HP);
-        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
-                            GPIO_DX_INPUT_ROUTE | GPIO_ST_HP_REAR | GPIO_ST_HP);
-
-        xonar_common_init(chip);
-
-        snd_component_add(chip->card, "PCM1792A");
-        snd_component_add(chip->card, "CS5381");
-}
-
-static void xonar_stx_init(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-
-        data->ext_power_reg = OXYGEN_GPI_DATA;
-        data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
-        data->ext_power_bit = GPI_DX_EXT_POWER;
-
-        xonar_st_init(chip);
-}
-
-static void xonar_disable_output(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-
-        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, data->output_enable_bit);
-}
-
-static void xonar_d2_cleanup(struct oxygen *chip)
-{
-        xonar_disable_output(chip);
-}
-
-static void xonar_d1_cleanup(struct oxygen *chip)
-{
-        xonar_disable_output(chip);
-        cs4362a_write(chip, 0x01, CS4362A_PDN | CS4362A_CPEN);
-        oxygen_clear_bits8(chip, OXYGEN_FUNCTION, OXYGEN_FUNCTION_RESET_CODEC);
-}
-
-static void xonar_hdav_cleanup(struct oxygen *chip)
-{
-        u8 param = 0;
-
-        hdmi_write_command(chip, 0x74, 1, &param);
-        xonar_disable_output(chip);
-}
-
-static void xonar_st_cleanup(struct oxygen *chip)
-{
-        xonar_disable_output(chip);
-}
-
-static void xonar_d2_suspend(struct oxygen *chip)
-{
-        xonar_d2_cleanup(chip);
-}
-
-static void xonar_d1_suspend(struct oxygen *chip)
-{
-        xonar_d1_cleanup(chip);
-}
-
-static void xonar_hdav_suspend(struct oxygen *chip)
-{
-        xonar_hdav_cleanup(chip);
-        msleep(2);
-}
-
-static void xonar_st_suspend(struct oxygen *chip)
-{
-        xonar_st_cleanup(chip);
-}
-
-static void xonar_d2_resume(struct oxygen *chip)
-{
-        pcm1796_init(chip);
-        xonar_enable_output(chip);
-}
-
-static void xonar_d1_resume(struct oxygen *chip)
-{
-        oxygen_set_bits8(chip, OXYGEN_FUNCTION, OXYGEN_FUNCTION_RESET_CODEC);
-        msleep(1);
-        cs43xx_init(chip);
-        xonar_enable_output(chip);
-}
-
-static void xonar_hdav_resume(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-        u8 param;
-
-        oxygen_reset_uart(chip);
-        param = 0;
-        hdmi_write_command(chip, 0x61, 1, &param);
-        param = 1;
-        hdmi_write_command(chip, 0x74, 1, &param);
-        hdmi_write_command(chip, 0x54, 5, data->hdmi_params);
-        pcm1796_init(chip);
-        xonar_enable_output(chip);
-}
-
-static void xonar_st_resume(struct oxygen *chip)
-{
-        pcm1796_init(chip);
-        xonar_enable_output(chip);
-}
-
-static void xonar_hdav_pcm_hardware_filter(unsigned int channel,
-                                           struct snd_pcm_hardware *hardware)
-{
-        if (channel == PCM_MULTICH) {
-                hardware->rates = SNDRV_PCM_RATE_44100 |
-                                  SNDRV_PCM_RATE_48000 |
-                                  SNDRV_PCM_RATE_96000 |
-                                  SNDRV_PCM_RATE_192000;
-                hardware->rate_min = 44100;
-        }
-}
-
-static void set_pcm1796_params(struct oxygen *chip,
-                               struct snd_pcm_hw_params *params)
-{
-        struct xonar_data *data = chip->model_data;
-        unsigned int i;
-
-        data->pcm1796_oversampling =
-                params_rate(params) >= 96000 ? PCM1796_OS_32 : PCM1796_OS_64;
-        for (i = 0; i < data->dacs; ++i)
-                pcm1796_write(chip, i, 20, data->pcm1796_oversampling);
-}
-
-static void set_cs53x1_params(struct oxygen *chip,
-                              struct snd_pcm_hw_params *params)
-{
-        unsigned int value;
-
-        if (params_rate(params) <= 54000)
-                value = GPIO_CS53x1_M_SINGLE;
-        else if (params_rate(params) <= 108000)
-                value = GPIO_CS53x1_M_DOUBLE;
-        else
-                value = GPIO_CS53x1_M_QUAD;
-        oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
-                              value, GPIO_CS53x1_M_MASK);
-}
-
-static void set_cs43xx_params(struct oxygen *chip,
-                              struct snd_pcm_hw_params *params)
-{
-        struct xonar_data *data = chip->model_data;
-
-        data->cs4398_fm = CS4398_DEM_NONE | CS4398_DIF_LJUST;
-        data->cs4362a_fm = CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
-        if (params_rate(params) <= 50000) {
-                data->cs4398_fm |= CS4398_FM_SINGLE;
-                data->cs4362a_fm |= CS4362A_FM_SINGLE;
-        } else if (params_rate(params) <= 100000) {
-                data->cs4398_fm |= CS4398_FM_DOUBLE;
-                data->cs4362a_fm |= CS4362A_FM_DOUBLE;
-        } else {
-                data->cs4398_fm |= CS4398_FM_QUAD;
-                data->cs4362a_fm |= CS4362A_FM_QUAD;
-        }
-        cs4398_write(chip, 2, data->cs4398_fm);
-        cs4362a_write(chip, 0x06, data->cs4362a_fm);
-        cs4362a_write(chip, 0x09, data->cs4362a_fm);
-        cs4362a_write(chip, 0x0c, data->cs4362a_fm);
-}
-
-static void set_hdmi_params(struct oxygen *chip,
-                            struct snd_pcm_hw_params *params)
-{
-        struct xonar_data *data = chip->model_data;
-
-        data->hdmi_params[0] = 0; /* 1 = non-audio */
-        switch (params_rate(params)) {
-        case 44100:
-                data->hdmi_params[1] = IEC958_AES3_CON_FS_44100;
-                break;
-        case 48000:
-                data->hdmi_params[1] = IEC958_AES3_CON_FS_48000;
-                break;
-        default: /* 96000 */
-                data->hdmi_params[1] = IEC958_AES3_CON_FS_96000;
-                break;
-        case 192000:
-                data->hdmi_params[1] = IEC958_AES3_CON_FS_192000;
-                break;
-        }
-        data->hdmi_params[2] = params_channels(params) / 2 - 1;
-        if (params_format(params) == SNDRV_PCM_FORMAT_S16_LE)
-                data->hdmi_params[3] = 0;
-        else
-                data->hdmi_params[3] = 0xc0;
-        data->hdmi_params[4] = 1; /* ? */
-        hdmi_write_command(chip, 0x54, 5, data->hdmi_params);
-}
-
-static void set_hdav_params(struct oxygen *chip,
-                            struct snd_pcm_hw_params *params)
-{
-        set_pcm1796_params(chip, params);
-        set_hdmi_params(chip, params);
-}
-
-static void xonar_gpio_changed(struct oxygen *chip)
-{
-        struct xonar_data *data = chip->model_data;
-        u8 has_power;
-
-        has_power = !!(oxygen_read8(chip, data->ext_power_reg)
-                       & data->ext_power_bit);
-        if (has_power != data->has_power) {
-                data->has_power = has_power;
-                if (has_power) {
-                        snd_printk(KERN_NOTICE "power restored\n");
-                } else {
-                        snd_printk(KERN_CRIT
-                                   "Hey! Don't unplug the power cable!\n");
-                        /* TODO: stop PCMs */
-                }
-        }
-}
-
-static void xonar_hdav_uart_input(struct oxygen *chip)
-{
-        if (chip->uart_input_count >= 2 &&
-            chip->uart_input[chip->uart_input_count - 2] == 'O' &&
-            chip->uart_input[chip->uart_input_count - 1] == 'K') {
-                printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:\n");
-                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                     chip->uart_input, chip->uart_input_count);
-                chip->uart_input_count = 0;
-        }
-}
-
-static int gpio_bit_switch_get(struct snd_kcontrol *ctl,
-                               struct snd_ctl_elem_value *value)
-{
-        struct oxygen *chip = ctl->private_data;
-        u16 bit = ctl->private_value;
-
-        value->value.integer.value[0] =
-                !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & bit);
-        return 0;
-}
-
-static int gpio_bit_switch_put(struct snd_kcontrol *ctl,
-                               struct snd_ctl_elem_value *value)
-{
-        struct oxygen *chip = ctl->private_data;
-        u16 bit = ctl->private_value;
-        u16 old_bits, new_bits;
-        int changed;
-
-        spin_lock_irq(&chip->reg_lock);
-        old_bits = oxygen_read16(chip, OXYGEN_GPIO_DATA);
-        if (value->value.integer.value[0])
-                new_bits = old_bits | bit;
-        else
-                new_bits = old_bits & ~bit;
-        changed = new_bits != old_bits;
-        if (changed)
-                oxygen_write16(chip, OXYGEN_GPIO_DATA, new_bits);
-        spin_unlock_irq(&chip->reg_lock);
-        return changed;
-}
-
-static const struct snd_kcontrol_new alt_switch = {
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "Analog Loopback Switch",
-        .info = snd_ctl_boolean_mono_info,
-        .get = gpio_bit_switch_get,
-        .put = gpio_bit_switch_put,
-        .private_value = GPIO_D2_ALT,
-};
-
-static const struct snd_kcontrol_new front_panel_switch = {
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "Front Panel Switch",
-        .info = snd_ctl_boolean_mono_info,
-        .get = gpio_bit_switch_get,
-        .put = gpio_bit_switch_put,
-        .private_value = GPIO_DX_FRONT_PANEL,
-};
-
-static int st_output_switch_info(struct snd_kcontrol *ctl,
-                                 struct snd_ctl_elem_info *info)
-{
-        static const char *const names[3] = {
-                "Speakers", "Headphones", "FP Headphones"
-        };
-
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 3;
-        if (info->value.enumerated.item >= 3)
-                info->value.enumerated.item = 2;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
-}
-
-static int st_output_switch_get(struct snd_kcontrol *ctl,
-                                struct snd_ctl_elem_value *value)
-{
-        struct oxygen *chip = ctl->private_data;
-        u16 gpio;
-
-        gpio = oxygen_read16(chip, OXYGEN_GPIO_DATA);
-        if (!(gpio & GPIO_ST_HP))
-                value->value.enumerated.item[0] = 0;
-        else if (gpio & GPIO_ST_HP_REAR)
-                value->value.enumerated.item[0] = 1;
-        else
-                value->value.enumerated.item[0] = 2;
-        return 0;
-}
-
-
-static int st_output_switch_put(struct snd_kcontrol *ctl,
-                                struct snd_ctl_elem_value *value)
-{
-        struct oxygen *chip = ctl->private_data;
-        u16 gpio_old, gpio;
-
-        mutex_lock(&chip->mutex);
-        gpio_old = oxygen_read16(chip, OXYGEN_GPIO_DATA);
-        gpio = gpio_old;
-        switch (value->value.enumerated.item[0]) {
-        case 0:
-                gpio &= ~(GPIO_ST_HP | GPIO_ST_HP_REAR);
-                break;
-        case 1:
-                gpio |= GPIO_ST_HP | GPIO_ST_HP_REAR;
-                break;
-        case 2:
-                gpio = (gpio | GPIO_ST_HP) & ~GPIO_ST_HP_REAR;
-                break;
-        }
-        oxygen_write16(chip, OXYGEN_GPIO_DATA, gpio);
-        mutex_unlock(&chip->mutex);
-        return gpio != gpio_old;
-}
-
-static const struct snd_kcontrol_new st_output_switch = {
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "Analog Output",
-        .info = st_output_switch_info,
-        .get = st_output_switch_get,
-        .put = st_output_switch_put,
-};
-
-static void xonar_line_mic_ac97_switch(struct oxygen *chip,
-                                       unsigned int reg, unsigned int mute)
-{
-        if (reg == AC97_LINE) {
-                spin_lock_irq(&chip->reg_lock);
-                oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
-                                      mute ? GPIO_DX_INPUT_ROUTE : 0,
-                                      GPIO_DX_INPUT_ROUTE);
-                spin_unlock_irq(&chip->reg_lock);
-        }
-}
-
-static const DECLARE_TLV_DB_SCALE(pcm1796_db_scale, -6000, 50, 0);
-static const DECLARE_TLV_DB_SCALE(cs4362a_db_scale, -6000, 100, 0);
-
-static int xonar_d2_control_filter(struct snd_kcontrol_new *template)
-{
-        if (!strncmp(template->name, "CD Capture ", 11))
-                /* CD in is actually connected to the video in pin */
-                template->private_value ^= AC97_CD ^ AC97_VIDEO;
-        return 0;
-}
-
-static int xonar_d1_control_filter(struct snd_kcontrol_new *template)
-{
-        if (!strncmp(template->name, "CD Capture ", 11))
-                return 1; /* no CD input */
-        return 0;
-}
-
-static int xonar_st_control_filter(struct snd_kcontrol_new *template)
-{
-        if (!strncmp(template->name, "CD Capture ", 11))
-                return 1; /* no CD input */
-        if (!strcmp(template->name, "Stereo Upmixing"))
-                return 1; /* stereo only - we don't need upmixing */
-        return 0;
-}
-
-static int xonar_d2_mixer_init(struct oxygen *chip)
-{
-        return snd_ctl_add(chip->card, snd_ctl_new1(&alt_switch, chip));
-}
-
-static int xonar_d1_mixer_init(struct oxygen *chip)
-{
-        return snd_ctl_add(chip->card, snd_ctl_new1(&front_panel_switch, chip));
-}
-
-static int xonar_st_mixer_init(struct oxygen *chip)
-{
-        return snd_ctl_add(chip->card, snd_ctl_new1(&st_output_switch, chip));
-}
-
-static const struct oxygen_model model_xonar_d2 = {
-        .longname = "Asus Virtuoso 200",
-        .chip = "AV200",
-        .init = xonar_d2_init,
-        .control_filter = xonar_d2_control_filter,
-        .mixer_init = xonar_d2_mixer_init,
-        .cleanup = xonar_d2_cleanup,
-        .suspend = xonar_d2_suspend,
-        .resume = xonar_d2_resume,
-        .set_dac_params = set_pcm1796_params,
-        .set_adc_params = set_cs53x1_params,
-        .update_dac_volume = update_pcm1796_volume,
-        .update_dac_mute = update_pcm1796_mute,
-        .dac_tlv = pcm1796_db_scale,
-        .model_data_size = sizeof(struct xonar_data),
-        .device_config = PLAYBACK_0_TO_I2S |
-                         PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_2 |
-                         CAPTURE_1_FROM_SPDIF |
-                         MIDI_OUTPUT |
-                         MIDI_INPUT,
-        .dac_channels = 8,
-        .dac_volume_min = 255 - 2*60,
-        .dac_volume_max = 255,
-        .misc_flags = OXYGEN_MISC_MIDI,
-        .function_flags = OXYGEN_FUNCTION_SPI |
-                          OXYGEN_FUNCTION_ENABLE_SPI_4_5,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-};
-
-static const struct oxygen_model model_xonar_d1 = {
-        .longname = "Asus Virtuoso 100",
-        .chip = "AV200",
-        .init = xonar_d1_init,
-        .control_filter = xonar_d1_control_filter,
-        .mixer_init = xonar_d1_mixer_init,
-        .cleanup = xonar_d1_cleanup,
-        .suspend = xonar_d1_suspend,
-        .resume = xonar_d1_resume,
-        .set_dac_params = set_cs43xx_params,
-        .set_adc_params = set_cs53x1_params,
-        .update_dac_volume = update_cs43xx_volume,
-        .update_dac_mute = update_cs43xx_mute,
-        .ac97_switch = xonar_line_mic_ac97_switch,
-        .dac_tlv = cs4362a_db_scale,
-        .model_data_size = sizeof(struct xonar_data),
-        .device_config = PLAYBACK_0_TO_I2S |
-                         PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_2,
-        .dac_channels = 8,
-        .dac_volume_min = 127 - 60,
-        .dac_volume_max = 127,
-        .function_flags = OXYGEN_FUNCTION_2WIRE,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-};
-
-static const struct oxygen_model model_xonar_hdav = {
-        .longname = "Asus Virtuoso 200",
-        .chip = "AV200",
-        .init = xonar_hdav_init,
-        .cleanup = xonar_hdav_cleanup,
-        .suspend = xonar_hdav_suspend,
-        .resume = xonar_hdav_resume,
-        .pcm_hardware_filter = xonar_hdav_pcm_hardware_filter,
-        .set_dac_params = set_hdav_params,
-        .set_adc_params = set_cs53x1_params,
-        .update_dac_volume = update_pcm1796_volume,
-        .update_dac_mute = update_pcm1796_mute,
-        .uart_input = xonar_hdav_uart_input,
-        .ac97_switch = xonar_line_mic_ac97_switch,
-        .dac_tlv = pcm1796_db_scale,
-        .model_data_size = sizeof(struct xonar_data),
-        .device_config = PLAYBACK_0_TO_I2S |
-                         PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_2 |
-                         CAPTURE_1_FROM_SPDIF,
-        .dac_channels = 8,
-        .dac_volume_min = 255 - 2*60,
-        .dac_volume_max = 255,
-        .misc_flags = OXYGEN_MISC_MIDI,
-        .function_flags = OXYGEN_FUNCTION_2WIRE,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-};
-
-static const struct oxygen_model model_xonar_st = {
-        .longname = "Asus Virtuoso 100",
-        .chip = "AV200",
-        .init = xonar_st_init,
-        .control_filter = xonar_st_control_filter,
-        .mixer_init = xonar_st_mixer_init,
-        .cleanup = xonar_st_cleanup,
-        .suspend = xonar_st_suspend,
-        .resume = xonar_st_resume,
-        .set_dac_params = set_pcm1796_params,
-        .set_adc_params = set_cs53x1_params,
-        .update_dac_volume = update_pcm1796_volume,
-        .update_dac_mute = update_pcm1796_mute,
-        .ac97_switch = xonar_line_mic_ac97_switch,
-        .dac_tlv = pcm1796_db_scale,
-        .model_data_size = sizeof(struct xonar_data),
-        .device_config = PLAYBACK_0_TO_I2S |
-                         PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_2,
-        .dac_channels = 2,
-        .dac_volume_min = 255 - 2*60,
-        .dac_volume_max = 255,
-        .function_flags = OXYGEN_FUNCTION_2WIRE,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-};
-
 static int __devinit get_xonar_model(struct oxygen *chip,
                                      const struct pci_device_id *id)
 {
-        static const struct oxygen_model *const models[] = {
-                [MODEL_D1]      = &model_xonar_d1,
-                [MODEL_DX]      = &model_xonar_d1,
-                [MODEL_D2]      = &model_xonar_d2,
-                [MODEL_D2X]     = &model_xonar_d2,
-                [MODEL_HDAV]    = &model_xonar_hdav,
-                [MODEL_ST]      = &model_xonar_st,
-                [MODEL_STX]     = &model_xonar_st,
-        };
-        static const char *const names[] = {
-                [MODEL_D1]      = "Xonar D1",
-                [MODEL_DX]      = "Xonar DX",
-                [MODEL_D2]      = "Xonar D2",
-                [MODEL_D2X]     = "Xonar D2X",
-                [MODEL_HDAV]    = "Xonar HDAV1.3",
-                [MODEL_HDAV_H6] = "Xonar HDAV1.3+H6",
-                [MODEL_ST]      = "Xonar Essence ST",
-                [MODEL_ST_H6]   = "Xonar Essence ST+H6",
-                [MODEL_STX]     = "Xonar Essence STX",
-        };
-        unsigned int model = id->driver_data;
-
-        if (model >= ARRAY_SIZE(models) || !models[model])
-                return -EINVAL;
-        chip->model = *models[model];
-
-        switch (model) {
-        case MODEL_D2X:
-                chip->model.init = xonar_d2x_init;
-                break;
-        case MODEL_DX:
-                chip->model.init = xonar_dx_init;
-                break;
-        case MODEL_HDAV:
-                oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DB_MASK);
-                switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_DB_MASK) {
-                case GPIO_DB_H6:
-                        model = MODEL_HDAV_H6;
-                        break;
-                case GPIO_DB_XX:
-                        snd_printk(KERN_ERR "unknown daughterboard\n");
-                        return -ENODEV;
-                }
-                break;
-        case MODEL_ST:
-                oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DB_MASK);
-                switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_DB_MASK) {
-                case GPIO_DB_H6:
-                        model = MODEL_ST_H6;
-                        break;
-                }
-                break;
-        case MODEL_STX:
-                chip->model.init = xonar_stx_init;
-                oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DB_MASK);
-                break;
-        }
-
-        chip->model.shortname = names[model];
-        chip->model.private_data = model;
-        return 0;
+        if (get_xonar_pcm179x_model(chip, id) >= 0)
+                return 0;
+        if (get_xonar_cs43xx_model(chip, id) >= 0)
+                return 0;
+        if (get_xonar_wm87x6_model(chip, id) >= 0)
+                return 0;
+        return -EINVAL;
 }
 
 static int __devinit xonar_probe(struct pci_dev *pci,
diff --git a/sound/pci/oxygen/wm8766.h b/sound/pci/oxygen/wm8766.h
new file mode 100644
index 000000000000..e0e849a7eaeb
--- /dev/null
+++ b/sound/pci/oxygen/wm8766.h
@@ -0,0 +1,73 @@
+#ifndef WM8766_H_INCLUDED
+#define WM8766_H_INCLUDED
+
+#define WM8766_LDA1             0x00
+#define WM8766_RDA1             0x01
+#define WM8766_DAC_CTRL         0x02
+#define WM8766_INT_CTRL         0x03
+#define WM8766_LDA2             0x04
+#define WM8766_RDA2             0x05
+#define WM8766_LDA3             0x06
+#define WM8766_RDA3             0x07
+#define WM8766_MASTDA           0x08
+#define WM8766_DAC_CTRL2        0x09
+#define WM8766_DAC_CTRL3        0x0a
+#define WM8766_MUTE1            0x0c
+#define WM8766_MUTE2            0x0f
+#define WM8766_RESET            0x1f
+
+/* LDAx/RDAx/MASTDA */
+#define WM8766_ATT_MASK         0x0ff
+#define WM8766_UPDATE           0x100
+/* DAC_CTRL */
+#define WM8766_MUTEALL          0x001
+#define WM8766_DEEMPALL         0x002
+#define WM8766_PWDN             0x004
+#define WM8766_ATC              0x008
+#define WM8766_IZD              0x010
+#define WM8766_PL_LEFT_MASK     0x060
+#define WM8766_PL_LEFT_MUTE     0x000
+#define WM8766_PL_LEFT_LEFT     0x020
+#define WM8766_PL_LEFT_RIGHT    0x040
+#define WM8766_PL_LEFT_LRMIX    0x060
+#define WM8766_PL_RIGHT_MASK    0x180
+#define WM8766_PL_RIGHT_MUTE    0x000
+#define WM8766_PL_RIGHT_LEFT    0x080
+#define WM8766_PL_RIGHT_RIGHT   0x100
+#define WM8766_PL_RIGHT_LRMIX   0x180
+/* INT_CTRL */
+#define WM8766_FMT_MASK         0x003
+#define WM8766_FMT_RJUST        0x000
+#define WM8766_FMT_LJUST        0x001
+#define WM8766_FMT_I2S          0x002
+#define WM8766_FMT_DSP          0x003
+#define WM8766_LRP              0x004
+#define WM8766_BCP              0x008
+#define WM8766_IWL_MASK         0x030
+#define WM8766_IWL_16           0x000
+#define WM8766_IWL_20           0x010
+#define WM8766_IWL_24           0x020
+#define WM8766_IWL_32           0x030
+#define WM8766_PHASE_MASK       0x1c0
+/* DAC_CTRL2 */
+#define WM8766_ZCD              0x001
+#define WM8766_DZFM_MASK        0x006
+#define WM8766_DMUTE_MASK       0x038
+#define WM8766_DEEMP_MASK       0x1c0
+/* DAC_CTRL3 */
+#define WM8766_DACPD_MASK       0x00e
+#define WM8766_PWRDNALL         0x010
+#define WM8766_MS               0x020
+#define WM8766_RATE_MASK        0x1c0
+#define WM8766_RATE_128         0x000
+#define WM8766_RATE_192         0x040
+#define WM8766_RATE_256         0x080
+#define WM8766_RATE_384         0x0c0
+#define WM8766_RATE_512         0x100
+#define WM8766_RATE_768         0x140
+/* MUTE1 */
+#define WM8766_MPD1             0x040
+/* MUTE2 */
+#define WM8766_MPD2             0x020
+
+#endif
diff --git a/sound/pci/oxygen/wm8776.h b/sound/pci/oxygen/wm8776.h
new file mode 100644
index 000000000000..1a96f5615727
--- /dev/null
+++ b/sound/pci/oxygen/wm8776.h
@@ -0,0 +1,177 @@
+#ifndef WM8776_H_INCLUDED
+#define WM8776_H_INCLUDED
+
+/*
+ * the following register names are from:
+ * wm8776.h  --  WM8776 ASoC driver
+ *
+ * Copyright 2009 Wolfson Microelectronics plc
+ *
+ * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#define WM8776_HPLVOL           0x00
+#define WM8776_HPRVOL           0x01
+#define WM8776_HPMASTER         0x02
+#define WM8776_DACLVOL          0x03
+#define WM8776_DACRVOL          0x04
+#define WM8776_DACMASTER        0x05
+#define WM8776_PHASESWAP        0x06
+#define WM8776_DACCTRL1         0x07
+#define WM8776_DACMUTE          0x08
+#define WM8776_DACCTRL2         0x09
+#define WM8776_DACIFCTRL        0x0a
+#define WM8776_ADCIFCTRL        0x0b
+#define WM8776_MSTRCTRL         0x0c
+#define WM8776_PWRDOWN          0x0d
+#define WM8776_ADCLVOL          0x0e
+#define WM8776_ADCRVOL          0x0f
+#define WM8776_ALCCTRL1         0x10
+#define WM8776_ALCCTRL2         0x11
+#define WM8776_ALCCTRL3         0x12
+#define WM8776_NOISEGATE        0x13
+#define WM8776_LIMITER          0x14
+#define WM8776_ADCMUX           0x15
+#define WM8776_OUTMUX           0x16
+#define WM8776_RESET            0x17
+
+
+/* HPLVOL/HPRVOL/HPMASTER */
+#define WM8776_HPATT_MASK       0x07f
+#define WM8776_HPZCEN           0x080
+#define WM8776_UPDATE           0x100
+
+/* DACLVOL/DACRVOL/DACMASTER */
+#define WM8776_DATT_MASK        0x0ff
+/*#define WM8776_UPDATE         0x100*/
+
+/* PHASESWAP */
+#define WM8776_PH_MASK          0x003
+
+/* DACCTRL1 */
+#define WM8776_DZCEN            0x001
+#define WM8776_ATC              0x002
+#define WM8776_IZD              0x004
+#define WM8776_TOD              0x008
+#define WM8776_PL_LEFT_MASK     0x030
+#define WM8776_PL_LEFT_MUTE     0x000
+#define WM8776_PL_LEFT_LEFT     0x010
+#define WM8776_PL_LEFT_RIGHT    0x020
+#define WM8776_PL_LEFT_LRMIX    0x030
+#define WM8776_PL_RIGHT_MASK    0x0c0
+#define WM8776_PL_RIGHT_MUTE    0x000
+#define WM8776_PL_RIGHT_LEFT    0x040
+#define WM8776_PL_RIGHT_RIGHT   0x080
+#define WM8776_PL_RIGHT_LRMIX   0x0c0
+
+/* DACMUTE */
+#define WM8776_DMUTE            0x001
+
+/* DACCTRL2 */
+#define WM8776_DEEMPH           0x001
+#define WM8776_DZFM_MASK        0x006
+#define WM8776_DZFM_NONE        0x000
+#define WM8776_DZFM_LR          0x002
+#define WM8776_DZFM_BOTH        0x004
+#define WM8776_DZFM_EITHER      0x006
+
+/* DACIFCTRL */
+#define WM8776_DACFMT_MASK      0x003
+#define WM8776_DACFMT_RJUST     0x000
+#define WM8776_DACFMT_LJUST     0x001
+#define WM8776_DACFMT_I2S       0x002
+#define WM8776_DACFMT_DSP       0x003
+#define WM8776_DACLRP           0x004
+#define WM8776_DACBCP           0x008
+#define WM8776_DACWL_MASK       0x030
+#define WM8776_DACWL_16         0x000
+#define WM8776_DACWL_20         0x010
+#define WM8776_DACWL_24         0x020
+#define WM8776_DACWL_32         0x030
+
+/* ADCIFCTRL */
+#define WM8776_ADCFMT_MASK      0x003
+#define WM8776_ADCFMT_RJUST     0x000
+#define WM8776_ADCFMT_LJUST     0x001
+#define WM8776_ADCFMT_I2S       0x002
+#define WM8776_ADCFMT_DSP       0x003
+#define WM8776_ADCLRP           0x004
+#define WM8776_ADCBCP           0x008
+#define WM8776_ADCWL_MASK       0x030
+#define WM8776_ADCWL_16         0x000
+#define WM8776_ADCWL_20         0x010
+#define WM8776_ADCWL_24         0x020
+#define WM8776_ADCWL_32         0x030
+#define WM8776_ADCMCLK          0x040
+#define WM8776_ADCHPD           0x100
+
+/* MSTRCTRL */
+#define WM8776_ADCRATE_MASK     0x007
+#define WM8776_ADCRATE_256      0x002
+#define WM8776_ADCRATE_384      0x003
+#define WM8776_ADCRATE_512      0x004
+#define WM8776_ADCRATE_768      0x005
+#define WM8776_ADCOSR           0x008
+#define WM8776_DACRATE_MASK     0x070
+#define WM8776_DACRATE_128      0x000
+#define WM8776_DACRATE_192      0x010
+#define WM8776_DACRATE_256      0x020
+#define WM8776_DACRATE_384      0x030
+#define WM8776_DACRATE_512      0x040
+#define WM8776_DACRATE_768      0x050
+#define WM8776_DACMS            0x080
+#define WM8776_ADCMS            0x100
+
+/* PWRDOWN */
+#define WM8776_PDWN             0x001
+#define WM8776_ADCPD            0x002
+#define WM8776_DACPD            0x004
+#define WM8776_HPPD             0x008
+#define WM8776_AINPD            0x040
+
+/* ADCLVOL/ADCRVOL */
+#define WM8776_AGMASK           0x0ff
+#define WM8776_ZCA              0x100
+
+/* ALCCTRL1 */
+#define WM8776_LCT_MASK         0x00f
+#define WM8776_MAXGAIN_MASK     0x070
+#define WM8776_LCSEL_MASK       0x180
+#define WM8776_LCSEL_LIMITER    0x000
+#define WM8776_LCSEL_ALC_RIGHT 0x080
+#define WM8776_LCSEL_ALC_LEFT   0x100
+#define WM8776_LCSEL_ALC_STEREO 0x180
+
+/* ALCCTRL2 */
+#define WM8776_HLD_MASK         0x00f
+#define WM8776_ALCZC            0x080
+#define WM8776_LCEN             0x100
+
+/* ALCCTRL3 */
+#define WM8776_ATK_MASK         0x00f
+#define WM8776_DCY_MASK         0x0f0
+
+/* NOISEGATE */
+#define WM8776_NGAT             0x001
+#define WM8776_NGTH_MASK        0x01c
+
+/* LIMITER */
+#define WM8776_MAXATTEN_MASK    0x00f
+#define WM8776_TRANWIN_MASK     0x070
+
+/* ADCMUX */
+#define WM8776_AMX_MASK         0x01f
+#define WM8776_MUTERA           0x040
+#define WM8776_MUTELA           0x080
+#define WM8776_LRBOTH           0x100
+
+/* OUTMUX */
+#define WM8776_MX_DAC           0x001
+#define WM8776_MX_AUX           0x002
+#define WM8776_MX_BYPASS        0x004
+
+#endif
diff --git a/sound/pci/oxygen/xonar.h b/sound/pci/oxygen/xonar.h
new file mode 100644
index 000000000000..b35343b0a9a5
--- /dev/null
+++ b/sound/pci/oxygen/xonar.h
@@ -0,0 +1,52 @@
+#ifndef XONAR_H_INCLUDED
+#define XONAR_H_INCLUDED
+
+#include "oxygen.h"
+
+struct xonar_generic {
+        unsigned int anti_pop_delay;
+        u16 output_enable_bit;
+        u8 ext_power_reg;
+        u8 ext_power_int_reg;
+        u8 ext_power_bit;
+        u8 has_power;
+};
+
+struct xonar_hdmi {
+        u8 params[5];
+};
+
+/* generic helper functions */
+
+void xonar_enable_output(struct oxygen *chip);
+void xonar_disable_output(struct oxygen *chip);
+void xonar_init_ext_power(struct oxygen *chip);
+void xonar_init_cs53x1(struct oxygen *chip);
+void xonar_set_cs53x1_params(struct oxygen *chip,
+                             struct snd_pcm_hw_params *params);
+int xonar_gpio_bit_switch_get(struct snd_kcontrol *ctl,
+                              struct snd_ctl_elem_value *value);
+int xonar_gpio_bit_switch_put(struct snd_kcontrol *ctl,
+                              struct snd_ctl_elem_value *value);
+
+/* model-specific card drivers */
+
+int get_xonar_pcm179x_model(struct oxygen *chip,
+                            const struct pci_device_id *id);
+int get_xonar_cs43xx_model(struct oxygen *chip,
+                           const struct pci_device_id *id);
+int get_xonar_wm87x6_model(struct oxygen *chip,
+                           const struct pci_device_id *id);
+
+/* HDMI helper functions */
+
+void xonar_hdmi_init(struct oxygen *chip, struct xonar_hdmi *data);
+void xonar_hdmi_cleanup(struct oxygen *chip);
+void xonar_hdmi_resume(struct oxygen *chip, struct xonar_hdmi *hdmi);
+void xonar_hdmi_pcm_hardware_filter(unsigned int channel,
+                                    struct snd_pcm_hardware *hardware);
+void xonar_set_hdmi_params(struct oxygen *chip, struct xonar_hdmi *hdmi,
+                           struct snd_pcm_hw_params *params);
+void xonar_hdmi_uart_input(struct oxygen *chip);
+
+#endif
diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c
new file mode 100644
index 000000000000..7c4986b27f2b
--- /dev/null
+++ b/sound/pci/oxygen/xonar_cs43xx.c
@@ -0,0 +1,437 @@
+/*
+ * card driver for models with CS4398/CS4362A DACs (Xonar D1/DX)
+ *
+ * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
+ *
+ *
+ *  This driver is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License, version 2.
+ *
+ *  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 driver; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Xonar D1/DX
+ * -----------
+ *
+ * CMI8788:
+ *
+ * I²C <-> CS4398 (front)
+ *     <-> CS4362A (surround, center/LFE, back)
+ *
+ * GPI 0 <- external power present (DX only)
+ *
+ * GPIO 0 -> enable output to speakers
+ * GPIO 1 -> enable front panel I/O
+ * GPIO 2 -> M0 of CS5361
+ * GPIO 3 -> M1 of CS5361
+ * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
+ *
+ * CS4398:
+ *
+ * AD0 <- 1
+ * AD1 <- 1
+ *
+ * CS4362A:
+ *
+ * AD0 <- 0
+ *
+ * CM9780:
+ *
+ * GPO 0 -> route line-in (0) or AC97 output (1) to CS5361 input
+ */
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <sound/ac97_codec.h>
+#include <sound/control.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/tlv.h>
+#include "xonar.h"
+#include "cm9780.h"
+#include "cs4398.h"
+#include "cs4362a.h"
+
+#define GPI_EXT_POWER           0x01
+#define GPIO_D1_OUTPUT_ENABLE   0x0001
+#define GPIO_D1_FRONT_PANEL     0x0002
+#define GPIO_D1_INPUT_ROUTE     0x0100
+
+#define I2C_DEVICE_CS4398       0x9e    /* 10011, AD1=1, AD0=1, /W=0 */
+#define I2C_DEVICE_CS4362A      0x30    /* 001100, AD0=0, /W=0 */
+
+struct xonar_cs43xx {
+        struct xonar_generic generic;
+        u8 cs4398_regs[8];
+        u8 cs4362a_regs[15];
+};
+
+static void cs4398_write(struct oxygen *chip, u8 reg, u8 value)
+{
+        struct xonar_cs43xx *data = chip->model_data;
+
+        oxygen_write_i2c(chip, I2C_DEVICE_CS4398, reg, value);
+        if (reg < ARRAY_SIZE(data->cs4398_regs))
+                data->cs4398_regs[reg] = value;
+}
+
+static void cs4398_write_cached(struct oxygen *chip, u8 reg, u8 value)
+{
+        struct xonar_cs43xx *data = chip->model_data;
+
+        if (value != data->cs4398_regs[reg])
+                cs4398_write(chip, reg, value);
+}
+
+static void cs4362a_write(struct oxygen *chip, u8 reg, u8 value)
+{
+        struct xonar_cs43xx *data = chip->model_data;
+
+        oxygen_write_i2c(chip, I2C_DEVICE_CS4362A, reg, value);
+        if (reg < ARRAY_SIZE(data->cs4362a_regs))
+                data->cs4362a_regs[reg] = value;
+}
+
+static void cs4362a_write_cached(struct oxygen *chip, u8 reg, u8 value)
+{
+        struct xonar_cs43xx *data = chip->model_data;
+
+        if (value != data->cs4362a_regs[reg])
+                cs4362a_write(chip, reg, value);
+}
+
+static void cs43xx_registers_init(struct oxygen *chip)
+{
+        struct xonar_cs43xx *data = chip->model_data;
+        unsigned int i;
+
+        /* set CPEN (control port mode) and power down */
+        cs4398_write(chip, 8, CS4398_CPEN | CS4398_PDN);
+        cs4362a_write(chip, 0x01, CS4362A_PDN | CS4362A_CPEN);
+        /* configure */
+        cs4398_write(chip, 2, data->cs4398_regs[2]);
+        cs4398_write(chip, 3, CS4398_ATAPI_B_R | CS4398_ATAPI_A_L);
+        cs4398_write(chip, 4, data->cs4398_regs[4]);
+        cs4398_write(chip, 5, data->cs4398_regs[5]);
+        cs4398_write(chip, 6, data->cs4398_regs[6]);
+        cs4398_write(chip, 7, data->cs4398_regs[7]);
+        cs4362a_write(chip, 0x02, CS4362A_DIF_LJUST);
+        cs4362a_write(chip, 0x03, CS4362A_MUTEC_6 | CS4362A_AMUTE |
+                      CS4362A_RMP_UP | CS4362A_ZERO_CROSS | CS4362A_SOFT_RAMP);
+        cs4362a_write(chip, 0x04, data->cs4362a_regs[0x04]);
+        cs4362a_write(chip, 0x05, 0);
+        for (i = 6; i <= 14; ++i)
+                cs4362a_write(chip, i, data->cs4362a_regs[i]);
+        /* clear power down */
+        cs4398_write(chip, 8, CS4398_CPEN);
+        cs4362a_write(chip, 0x01, CS4362A_CPEN);
+}
+
+static void xonar_d1_init(struct oxygen *chip)
+{
+        struct xonar_cs43xx *data = chip->model_data;
+
+        data->generic.anti_pop_delay = 800;
+        data->generic.output_enable_bit = GPIO_D1_OUTPUT_ENABLE;
+        data->cs4398_regs[2] =
+                CS4398_FM_SINGLE | CS4398_DEM_NONE | CS4398_DIF_LJUST;
+        data->cs4398_regs[4] = CS4398_MUTEP_LOW |
+                CS4398_MUTE_B | CS4398_MUTE_A | CS4398_PAMUTE;
+        data->cs4398_regs[5] = 60 * 2;
+        data->cs4398_regs[6] = 60 * 2;
+        data->cs4398_regs[7] = CS4398_RMP_DN | CS4398_RMP_UP |
+                CS4398_ZERO_CROSS | CS4398_SOFT_RAMP;
+        data->cs4362a_regs[4] = CS4362A_RMP_DN | CS4362A_DEM_NONE;
+        data->cs4362a_regs[6] = CS4362A_FM_SINGLE |
+                CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
+        data->cs4362a_regs[7] = 60 | CS4362A_MUTE;
+        data->cs4362a_regs[8] = 60 | CS4362A_MUTE;
+        data->cs4362a_regs[9] = data->cs4362a_regs[6];
+        data->cs4362a_regs[10] = 60 | CS4362A_MUTE;
+        data->cs4362a_regs[11] = 60 | CS4362A_MUTE;
+        data->cs4362a_regs[12] = data->cs4362a_regs[6];
+        data->cs4362a_regs[13] = 60 | CS4362A_MUTE;
+        data->cs4362a_regs[14] = 60 | CS4362A_MUTE;
+
+        oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
+                       OXYGEN_2WIRE_LENGTH_8 |
+                       OXYGEN_2WIRE_INTERRUPT_MASK |
+                       OXYGEN_2WIRE_SPEED_FAST);
+
+        cs43xx_registers_init(chip);
+
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
+                          GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
+                            GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
+
+        oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC);
+
+        xonar_init_cs53x1(chip);
+        xonar_enable_output(chip);
+
+        snd_component_add(chip->card, "CS4398");
+        snd_component_add(chip->card, "CS4362A");
+        snd_component_add(chip->card, "CS5361");
+}
+
+static void xonar_dx_init(struct oxygen *chip)
+{
+        struct xonar_cs43xx *data = chip->model_data;
+
+        data->generic.ext_power_reg = OXYGEN_GPI_DATA;
+        data->generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
+        data->generic.ext_power_bit = GPI_EXT_POWER;
+        xonar_init_ext_power(chip);
+        xonar_d1_init(chip);
+}
+
+static void xonar_d1_cleanup(struct oxygen *chip)
+{
+        xonar_disable_output(chip);
+        cs4362a_write(chip, 0x01, CS4362A_PDN | CS4362A_CPEN);
+        oxygen_clear_bits8(chip, OXYGEN_FUNCTION, OXYGEN_FUNCTION_RESET_CODEC);
+}
+
+static void xonar_d1_suspend(struct oxygen *chip)
+{
+        xonar_d1_cleanup(chip);
+}
+
+static void xonar_d1_resume(struct oxygen *chip)
+{
+        oxygen_set_bits8(chip, OXYGEN_FUNCTION, OXYGEN_FUNCTION_RESET_CODEC);
+        msleep(1);
+        cs43xx_registers_init(chip);
+        xonar_enable_output(chip);
+}
+
+static void set_cs43xx_params(struct oxygen *chip,
+                              struct snd_pcm_hw_params *params)
+{
+        struct xonar_cs43xx *data = chip->model_data;
+        u8 cs4398_fm, cs4362a_fm;
+
+        if (params_rate(params) <= 50000) {
+                cs4398_fm = CS4398_FM_SINGLE;
+                cs4362a_fm = CS4362A_FM_SINGLE;
+        } else if (params_rate(params) <= 100000) {
+                cs4398_fm = CS4398_FM_DOUBLE;
+                cs4362a_fm = CS4362A_FM_DOUBLE;
+        } else {
+                cs4398_fm = CS4398_FM_QUAD;
+                cs4362a_fm = CS4362A_FM_QUAD;
+        }
+        cs4398_fm |= CS4398_DEM_NONE | CS4398_DIF_LJUST;
+        cs4398_write_cached(chip, 2, cs4398_fm);
+        cs4362a_fm |= data->cs4362a_regs[6] & ~CS4362A_FM_MASK;
+        cs4362a_write_cached(chip, 6, cs4362a_fm);
+        cs4362a_write_cached(chip, 12, cs4362a_fm);
+        cs4362a_fm &= CS4362A_FM_MASK;
+        cs4362a_fm |= data->cs4362a_regs[9] & ~CS4362A_FM_MASK;
+        cs4362a_write_cached(chip, 9, cs4362a_fm);
+}
+
+static void update_cs4362a_volumes(struct oxygen *chip)
+{
+        unsigned int i;
+        u8 mute;
+
+        mute = chip->dac_mute ? CS4362A_MUTE : 0;
+        for (i = 0; i < 6; ++i)
+                cs4362a_write_cached(chip, 7 + i + i / 2,
+                                     (127 - chip->dac_volume[2 + i]) | mute);
+}
+
+static void update_cs43xx_volume(struct oxygen *chip)
+{
+        cs4398_write_cached(chip, 5, (127 - chip->dac_volume[0]) * 2);
+        cs4398_write_cached(chip, 6, (127 - chip->dac_volume[1]) * 2);
+        update_cs4362a_volumes(chip);
+}
+
+static void update_cs43xx_mute(struct oxygen *chip)
+{
+        u8 reg;
+
+        reg = CS4398_MUTEP_LOW | CS4398_PAMUTE;
+        if (chip->dac_mute)
+                reg |= CS4398_MUTE_B | CS4398_MUTE_A;
+        cs4398_write_cached(chip, 4, reg);
+        update_cs4362a_volumes(chip);
+}
+
+static void update_cs43xx_center_lfe_mix(struct oxygen *chip, bool mixed)
+{
+        struct xonar_cs43xx *data = chip->model_data;
+        u8 reg;
+
+        reg = data->cs4362a_regs[9] & ~CS4362A_ATAPI_MASK;
+        if (mixed)
+                reg |= CS4362A_ATAPI_B_LR | CS4362A_ATAPI_A_LR;
+        else
+                reg |= CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
+        cs4362a_write_cached(chip, 9, reg);
+}
+
+static const struct snd_kcontrol_new front_panel_switch = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Front Panel Switch",
+        .info = snd_ctl_boolean_mono_info,
+        .get = xonar_gpio_bit_switch_get,
+        .put = xonar_gpio_bit_switch_put,
+        .private_value = GPIO_D1_FRONT_PANEL,
+};
+
+static int rolloff_info(struct snd_kcontrol *ctl,
+                        struct snd_ctl_elem_info *info)
+{
+        static const char *const names[2] = {
+                "Fast Roll-off", "Slow Roll-off"
+        };
+
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = 1;
+        info->value.enumerated.items = 2;
+        if (info->value.enumerated.item >= 2)
+                info->value.enumerated.item = 1;
+        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
+        return 0;
+}
+
+static int rolloff_get(struct snd_kcontrol *ctl,
+                       struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_cs43xx *data = chip->model_data;
+
+        value->value.enumerated.item[0] =
+                (data->cs4398_regs[7] & CS4398_FILT_SEL) != 0;
+        return 0;
+}
+
+static int rolloff_put(struct snd_kcontrol *ctl,
+                       struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_cs43xx *data = chip->model_data;
+        int changed;
+        u8 reg;
+
+        mutex_lock(&chip->mutex);
+        reg = data->cs4398_regs[7];
+        if (value->value.enumerated.item[0])
+                reg |= CS4398_FILT_SEL;
+        else
+                reg &= ~CS4398_FILT_SEL;
+        changed = reg != data->cs4398_regs[7];
+        if (changed) {
+                cs4398_write(chip, 7, reg);
+                if (reg & CS4398_FILT_SEL)
+                        reg = data->cs4362a_regs[0x04] | CS4362A_FILT_SEL;
+                else
+                        reg = data->cs4362a_regs[0x04] & ~CS4362A_FILT_SEL;
+                cs4362a_write(chip, 0x04, reg);
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static const struct snd_kcontrol_new rolloff_control = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "DAC Filter Playback Enum",
+        .info = rolloff_info,
+        .get = rolloff_get,
+        .put = rolloff_put,
+};
+
+static void xonar_d1_line_mic_ac97_switch(struct oxygen *chip,
+                                          unsigned int reg, unsigned int mute)
+{
+        if (reg == AC97_LINE) {
+                spin_lock_irq(&chip->reg_lock);
+                oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                                      mute ? GPIO_D1_INPUT_ROUTE : 0,
+                                      GPIO_D1_INPUT_ROUTE);
+                spin_unlock_irq(&chip->reg_lock);
+        }
+}
+
+static const DECLARE_TLV_DB_SCALE(cs4362a_db_scale, -6000, 100, 0);
+
+static int xonar_d1_control_filter(struct snd_kcontrol_new *template)
+{
+        if (!strncmp(template->name, "CD Capture ", 11))
+                return 1; /* no CD input */
+        return 0;
+}
+
+static int xonar_d1_mixer_init(struct oxygen *chip)
+{
+        int err;
+
+        err = snd_ctl_add(chip->card, snd_ctl_new1(&front_panel_switch, chip));
+        if (err < 0)
+                return err;
+        err = snd_ctl_add(chip->card, snd_ctl_new1(&rolloff_control, chip));
+        if (err < 0)
+                return err;
+        return 0;
+}
+
+static const struct oxygen_model model_xonar_d1 = {
+        .longname = "Asus Virtuoso 100",
+        .chip = "AV200",
+        .init = xonar_d1_init,
+        .control_filter = xonar_d1_control_filter,
+        .mixer_init = xonar_d1_mixer_init,
+        .cleanup = xonar_d1_cleanup,
+        .suspend = xonar_d1_suspend,
+        .resume = xonar_d1_resume,
+        .get_i2s_mclk = oxygen_default_i2s_mclk,
+        .set_dac_params = set_cs43xx_params,
+        .set_adc_params = xonar_set_cs53x1_params,
+        .update_dac_volume = update_cs43xx_volume,
+        .update_dac_mute = update_cs43xx_mute,
+        .update_center_lfe_mix = update_cs43xx_center_lfe_mix,
+        .ac97_switch = xonar_d1_line_mic_ac97_switch,
+        .dac_tlv = cs4362a_db_scale,
+        .model_data_size = sizeof(struct xonar_cs43xx),
+        .device_config = PLAYBACK_0_TO_I2S |
+                         PLAYBACK_1_TO_SPDIF |
+                         CAPTURE_0_FROM_I2S_2,
+        .dac_channels = 8,
+        .dac_volume_min = 127 - 60,
+        .dac_volume_max = 127,
+        .function_flags = OXYGEN_FUNCTION_2WIRE,
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+};
+
+int __devinit get_xonar_cs43xx_model(struct oxygen *chip,
+                                     const struct pci_device_id *id)
+{
+        switch (id->subdevice) {
+        case 0x834f:
+                chip->model = model_xonar_d1;
+                chip->model.shortname = "Xonar D1";
+                break;
+        case 0x8275:
+        case 0x8327:
+                chip->model = model_xonar_d1;
+                chip->model.shortname = "Xonar DX";
+                chip->model.init = xonar_dx_init;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
diff --git a/sound/pci/oxygen/xonar_hdmi.c b/sound/pci/oxygen/xonar_hdmi.c
new file mode 100644
index 000000000000..b12db1f1cea9
--- /dev/null
+++ b/sound/pci/oxygen/xonar_hdmi.c
@@ -0,0 +1,128 @@
+/*
+ * helper functions for HDMI models (Xonar HDAV1.3)
+ *
+ * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
+ *
+ *
+ *  This driver is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License, version 2.
+ *
+ *  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 driver; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <sound/asoundef.h>
+#include <sound/control.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/tlv.h>
+#include "xonar.h"
+
+static void hdmi_write_command(struct oxygen *chip, u8 command,
+                               unsigned int count, const u8 *params)
+{
+        unsigned int i;
+        u8 checksum;
+
+        oxygen_write_uart(chip, 0xfb);
+        oxygen_write_uart(chip, 0xef);
+        oxygen_write_uart(chip, command);
+        oxygen_write_uart(chip, count);
+        for (i = 0; i < count; ++i)
+                oxygen_write_uart(chip, params[i]);
+        checksum = 0xfb + 0xef + command + count;
+        for (i = 0; i < count; ++i)
+                checksum += params[i];
+        oxygen_write_uart(chip, checksum);
+}
+
+static void xonar_hdmi_init_commands(struct oxygen *chip,
+                                     struct xonar_hdmi *hdmi)
+{
+        u8 param;
+
+        oxygen_reset_uart(chip);
+        param = 0;
+        hdmi_write_command(chip, 0x61, 1, &param);
+        param = 1;
+        hdmi_write_command(chip, 0x74, 1, &param);
+        hdmi_write_command(chip, 0x54, 5, hdmi->params);
+}
+
+void xonar_hdmi_init(struct oxygen *chip, struct xonar_hdmi *hdmi)
+{
+        hdmi->params[1] = IEC958_AES3_CON_FS_48000;
+        hdmi->params[4] = 1;
+        xonar_hdmi_init_commands(chip, hdmi);
+}
+
+void xonar_hdmi_cleanup(struct oxygen *chip)
+{
+        u8 param = 0;
+
+        hdmi_write_command(chip, 0x74, 1, &param);
+}
+
+void xonar_hdmi_resume(struct oxygen *chip, struct xonar_hdmi *hdmi)
+{
+        xonar_hdmi_init_commands(chip, hdmi);
+}
+
+void xonar_hdmi_pcm_hardware_filter(unsigned int channel,
+                                    struct snd_pcm_hardware *hardware)
+{
+        if (channel == PCM_MULTICH) {
+                hardware->rates = SNDRV_PCM_RATE_44100 |
+                                  SNDRV_PCM_RATE_48000 |
+                                  SNDRV_PCM_RATE_96000 |
+                                  SNDRV_PCM_RATE_192000;
+                hardware->rate_min = 44100;
+        }
+}
+
+void xonar_set_hdmi_params(struct oxygen *chip, struct xonar_hdmi *hdmi,
+                           struct snd_pcm_hw_params *params)
+{
+        hdmi->params[0] = 0; /* 1 = non-audio */
+        switch (params_rate(params)) {
+        case 44100:
+                hdmi->params[1] = IEC958_AES3_CON_FS_44100;
+                break;
+        case 48000:
+                hdmi->params[1] = IEC958_AES3_CON_FS_48000;
+                break;
+        default: /* 96000 */
+                hdmi->params[1] = IEC958_AES3_CON_FS_96000;
+                break;
+        case 192000:
+                hdmi->params[1] = IEC958_AES3_CON_FS_192000;
+                break;
+        }
+        hdmi->params[2] = params_channels(params) / 2 - 1;
+        if (params_format(params) == SNDRV_PCM_FORMAT_S16_LE)
+                hdmi->params[3] = 0;
+        else
+                hdmi->params[3] = 0xc0;
+        hdmi->params[4] = 1; /* ? */
+        hdmi_write_command(chip, 0x54, 5, hdmi->params);
+}
+
+void xonar_hdmi_uart_input(struct oxygen *chip)
+{
+        if (chip->uart_input_count >= 2 &&
+            chip->uart_input[chip->uart_input_count - 2] == 'O' &&
+            chip->uart_input[chip->uart_input_count - 1] == 'K') {
+                printk(KERN_DEBUG "message from HDMI chip received:\n");
+                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
+                                     chip->uart_input, chip->uart_input_count);
+                chip->uart_input_count = 0;
+        }
+}
diff --git a/sound/pci/oxygen/xonar_lib.c b/sound/pci/oxygen/xonar_lib.c
new file mode 100644
index 000000000000..b3ff71316653
--- /dev/null
+++ b/sound/pci/oxygen/xonar_lib.c
@@ -0,0 +1,132 @@
+/*
+ * helper functions for Asus Xonar cards
+ *
+ * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
+ *
+ *
+ *  This driver is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License, version 2.
+ *
+ *  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 driver; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/delay.h>
+#include <sound/core.h>
+#include <sound/control.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include "xonar.h"
+
+
+#define GPIO_CS53x1_M_MASK      0x000c
+#define GPIO_CS53x1_M_SINGLE    0x0000
+#define GPIO_CS53x1_M_DOUBLE    0x0004
+#define GPIO_CS53x1_M_QUAD      0x0008
+
+
+void xonar_enable_output(struct oxygen *chip)
+{
+        struct xonar_generic *data = chip->model_data;
+
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, data->output_enable_bit);
+        msleep(data->anti_pop_delay);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, data->output_enable_bit);
+}
+
+void xonar_disable_output(struct oxygen *chip)
+{
+        struct xonar_generic *data = chip->model_data;
+
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, data->output_enable_bit);
+}
+
+static void xonar_ext_power_gpio_changed(struct oxygen *chip)
+{
+        struct xonar_generic *data = chip->model_data;
+        u8 has_power;
+
+        has_power = !!(oxygen_read8(chip, data->ext_power_reg)
+                       & data->ext_power_bit);
+        if (has_power != data->has_power) {
+                data->has_power = has_power;
+                if (has_power) {
+                        snd_printk(KERN_NOTICE "power restored\n");
+                } else {
+                        snd_printk(KERN_CRIT
+                                   "Hey! Don't unplug the power cable!\n");
+                        /* TODO: stop PCMs */
+                }
+        }
+}
+
+void xonar_init_ext_power(struct oxygen *chip)
+{
+        struct xonar_generic *data = chip->model_data;
+
+        oxygen_set_bits8(chip, data->ext_power_int_reg,
+                         data->ext_power_bit);
+        chip->interrupt_mask |= OXYGEN_INT_GPIO;
+        chip->model.gpio_changed = xonar_ext_power_gpio_changed;
+        data->has_power = !!(oxygen_read8(chip, data->ext_power_reg)
+                             & data->ext_power_bit);
+}
+
+void xonar_init_cs53x1(struct oxygen *chip)
+{
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_CS53x1_M_MASK);
+        oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                              GPIO_CS53x1_M_SINGLE, GPIO_CS53x1_M_MASK);
+}
+
+void xonar_set_cs53x1_params(struct oxygen *chip,
+                             struct snd_pcm_hw_params *params)
+{
+        unsigned int value;
+
+        if (params_rate(params) <= 54000)
+                value = GPIO_CS53x1_M_SINGLE;
+        else if (params_rate(params) <= 108000)
+                value = GPIO_CS53x1_M_DOUBLE;
+        else
+                value = GPIO_CS53x1_M_QUAD;
+        oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                              value, GPIO_CS53x1_M_MASK);
+}
+
+int xonar_gpio_bit_switch_get(struct snd_kcontrol *ctl,
+                              struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        u16 bit = ctl->private_value;
+
+        value->value.integer.value[0] =
+                !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & bit);
+        return 0;
+}
+
+int xonar_gpio_bit_switch_put(struct snd_kcontrol *ctl,
+                              struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        u16 bit = ctl->private_value;
+        u16 old_bits, new_bits;
+        int changed;
+
+        spin_lock_irq(&chip->reg_lock);
+        old_bits = oxygen_read16(chip, OXYGEN_GPIO_DATA);
+        if (value->value.integer.value[0])
+                new_bits = old_bits | bit;
+        else
+                new_bits = old_bits & ~bit;
+        changed = new_bits != old_bits;
+        if (changed)
+                oxygen_write16(chip, OXYGEN_GPIO_DATA, new_bits);
+        spin_unlock_irq(&chip->reg_lock);
+        return changed;
+}
diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
new file mode 100644
index 000000000000..ba18fb546b4f
--- /dev/null
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -0,0 +1,1115 @@
+/*
+ * card driver for models with PCM1796 DACs (Xonar D2/D2X/HDAV1.3/ST/STX)
+ *
+ * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
+ *
+ *
+ *  This driver is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License, version 2.
+ *
+ *  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 driver; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Xonar D2/D2X
+ * ------------
+ *
+ * CMI8788:
+ *
+ * SPI 0 -> 1st PCM1796 (front)
+ * SPI 1 -> 2nd PCM1796 (surround)
+ * SPI 2 -> 3rd PCM1796 (center/LFE)
+ * SPI 4 -> 4th PCM1796 (back)
+ *
+ * GPIO 2 -> M0 of CS5381
+ * GPIO 3 -> M1 of CS5381
+ * GPIO 5 <- external power present (D2X only)
+ * GPIO 7 -> ALT
+ * GPIO 8 -> enable output to speakers
+ *
+ * CM9780:
+ *
+ * GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ */
+
+/*
+ * Xonar HDAV1.3 (Deluxe)
+ * ----------------------
+ *
+ * CMI8788:
+ *
+ * I²C <-> PCM1796 (front)
+ *
+ * GPI 0 <- external power present
+ *
+ * GPIO 0 -> enable output to speakers
+ * GPIO 2 -> M0 of CS5381
+ * GPIO 3 -> M1 of CS5381
+ * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
+ *
+ * TXD -> HDMI controller
+ * RXD <- HDMI controller
+ *
+ * PCM1796 front: AD1,0 <- 0,0
+ *
+ * CM9780:
+ *
+ * GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ *
+ * no daughterboard
+ * ----------------
+ *
+ * GPIO 4 <- 1
+ *
+ * H6 daughterboard
+ * ----------------
+ *
+ * GPIO 4 <- 0
+ * GPIO 5 <- 0
+ *
+ * I²C <-> PCM1796 (surround)
+ *     <-> PCM1796 (center/LFE)
+ *     <-> PCM1796 (back)
+ *
+ * PCM1796 surround:   AD1,0 <- 0,1
+ * PCM1796 center/LFE: AD1,0 <- 1,0
+ * PCM1796 back:       AD1,0 <- 1,1
+ *
+ * unknown daughterboard
+ * ---------------------
+ *
+ * GPIO 4 <- 0
+ * GPIO 5 <- 1
+ *
+ * I²C <-> CS4362A (surround, center/LFE, back)
+ *
+ * CS4362A: AD0 <- 0
+ */
+
+/*
+ * Xonar Essence ST (Deluxe)/STX
+ * -----------------------------
+ *
+ * CMI8788:
+ *
+ * I²C <-> PCM1792A
+ *     <-> CS2000 (ST only)
+ *
+ * ADC1 MCLK -> REF_CLK of CS2000 (ST only)
+ *
+ * GPI 0 <- external power present (STX only)
+ *
+ * GPIO 0 -> enable output to speakers
+ * GPIO 1 -> route HP to front panel (0) or rear jack (1)
+ * GPIO 2 -> M0 of CS5381
+ * GPIO 3 -> M1 of CS5381
+ * GPIO 7 -> route output to speaker jacks (0) or HP (1)
+ * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
+ *
+ * PCM1792A:
+ *
+ * AD1,0 <- 0,0
+ * SCK <- CLK_OUT of CS2000 (ST only)
+ *
+ * CS2000:
+ *
+ * AD0 <- 0
+ *
+ * CM9780:
+ *
+ * GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ *
+ * H6 daughterboard
+ * ----------------
+ *
+ * GPIO 4 <- 0
+ * GPIO 5 <- 0
+ */
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <sound/ac97_codec.h>
+#include <sound/control.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/tlv.h>
+#include "xonar.h"
+#include "cm9780.h"
+#include "pcm1796.h"
+#include "cs2000.h"
+
+
+#define GPIO_D2X_EXT_POWER      0x0020
+#define GPIO_D2_ALT             0x0080
+#define GPIO_D2_OUTPUT_ENABLE   0x0100
+
+#define GPI_EXT_POWER           0x01
+#define GPIO_INPUT_ROUTE        0x0100
+
+#define GPIO_HDAV_OUTPUT_ENABLE 0x0001
+
+#define GPIO_DB_MASK            0x0030
+#define GPIO_DB_H6              0x0000
+
+#define GPIO_ST_OUTPUT_ENABLE   0x0001
+#define GPIO_ST_HP_REAR         0x0002
+#define GPIO_ST_HP              0x0080
+
+#define I2C_DEVICE_PCM1796(i)   (0x98 + ((i) << 1))     /* 10011, ii, /W=0 */
+#define I2C_DEVICE_CS2000       0x9c                    /* 100111, 0, /W=0 */
+
+#define PCM1796_REG_BASE        16
+
+
+struct xonar_pcm179x {
+        struct xonar_generic generic;
+        unsigned int dacs;
+        u8 pcm1796_regs[4][5];
+        unsigned int current_rate;
+        bool os_128;
+        bool hp_active;
+        s8 hp_gain_offset;
+        bool has_cs2000;
+        u8 cs2000_fun_cfg_1;
+};
+
+struct xonar_hdav {
+        struct xonar_pcm179x pcm179x;
+        struct xonar_hdmi hdmi;
+};
+
+
+static inline void pcm1796_write_spi(struct oxygen *chip, unsigned int codec,
+                                     u8 reg, u8 value)
+{
+        /* maps ALSA channel pair number to SPI output */
+        static const u8 codec_map[4] = {
+                0, 1, 2, 4
+        };
+        oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER  |
+                         OXYGEN_SPI_DATA_LENGTH_2 |
+                         OXYGEN_SPI_CLOCK_160 |
+                         (codec_map[codec] << OXYGEN_SPI_CODEC_SHIFT) |
+                         OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
+                         (reg << 8) | value);
+}
+
+static inline void pcm1796_write_i2c(struct oxygen *chip, unsigned int codec,
+                                     u8 reg, u8 value)
+{
+        oxygen_write_i2c(chip, I2C_DEVICE_PCM1796(codec), reg, value);
+}
+
+static void pcm1796_write(struct oxygen *chip, unsigned int codec,
+                          u8 reg, u8 value)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        if ((chip->model.function_flags & OXYGEN_FUNCTION_2WIRE_SPI_MASK) ==
+            OXYGEN_FUNCTION_SPI)
+                pcm1796_write_spi(chip, codec, reg, value);
+        else
+                pcm1796_write_i2c(chip, codec, reg, value);
+        if ((unsigned int)(reg - PCM1796_REG_BASE)
+            < ARRAY_SIZE(data->pcm1796_regs[codec]))
+                data->pcm1796_regs[codec][reg - PCM1796_REG_BASE] = value;
+}
+
+static void pcm1796_write_cached(struct oxygen *chip, unsigned int codec,
+                                 u8 reg, u8 value)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        if (value != data->pcm1796_regs[codec][reg - PCM1796_REG_BASE])
+                pcm1796_write(chip, codec, reg, value);
+}
+
+static void cs2000_write(struct oxygen *chip, u8 reg, u8 value)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        oxygen_write_i2c(chip, I2C_DEVICE_CS2000, reg, value);
+        if (reg == CS2000_FUN_CFG_1)
+                data->cs2000_fun_cfg_1 = value;
+}
+
+static void cs2000_write_cached(struct oxygen *chip, u8 reg, u8 value)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        if (reg != CS2000_FUN_CFG_1 ||
+            value != data->cs2000_fun_cfg_1)
+                cs2000_write(chip, reg, value);
+}
+
+static void pcm1796_registers_init(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+        unsigned int i;
+        s8 gain_offset;
+
+        gain_offset = data->hp_active ? data->hp_gain_offset : 0;
+        for (i = 0; i < data->dacs; ++i) {
+                /* set ATLD before ATL/ATR */
+                pcm1796_write(chip, i, 18,
+                              data->pcm1796_regs[0][18 - PCM1796_REG_BASE]);
+                pcm1796_write(chip, i, 16, chip->dac_volume[i * 2]
+                              + gain_offset);
+                pcm1796_write(chip, i, 17, chip->dac_volume[i * 2 + 1]
+                              + gain_offset);
+                pcm1796_write(chip, i, 19,
+                              data->pcm1796_regs[0][19 - PCM1796_REG_BASE]);
+                pcm1796_write(chip, i, 20,
+                              data->pcm1796_regs[0][20 - PCM1796_REG_BASE]);
+                pcm1796_write(chip, i, 21, 0);
+        }
+}
+
+static void pcm1796_init(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        data->pcm1796_regs[0][18 - PCM1796_REG_BASE] = PCM1796_MUTE |
+                PCM1796_DMF_DISABLED | PCM1796_FMT_24_LJUST | PCM1796_ATLD;
+        data->pcm1796_regs[0][19 - PCM1796_REG_BASE] =
+                PCM1796_FLT_SHARP | PCM1796_ATS_1;
+        data->pcm1796_regs[0][20 - PCM1796_REG_BASE] = PCM1796_OS_64;
+        pcm1796_registers_init(chip);
+        data->current_rate = 48000;
+}
+
+static void xonar_d2_init(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        data->generic.anti_pop_delay = 300;
+        data->generic.output_enable_bit = GPIO_D2_OUTPUT_ENABLE;
+        data->dacs = 4;
+
+        pcm1796_init(chip);
+
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_D2_ALT);
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_D2_ALT);
+
+        oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC);
+
+        xonar_init_cs53x1(chip);
+        xonar_enable_output(chip);
+
+        snd_component_add(chip->card, "PCM1796");
+        snd_component_add(chip->card, "CS5381");
+}
+
+static void xonar_d2x_init(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        data->generic.ext_power_reg = OXYGEN_GPIO_DATA;
+        data->generic.ext_power_int_reg = OXYGEN_GPIO_INTERRUPT_MASK;
+        data->generic.ext_power_bit = GPIO_D2X_EXT_POWER;
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_D2X_EXT_POWER);
+        xonar_init_ext_power(chip);
+        xonar_d2_init(chip);
+}
+
+static void xonar_hdav_init(struct oxygen *chip)
+{
+        struct xonar_hdav *data = chip->model_data;
+
+        oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
+                       OXYGEN_2WIRE_LENGTH_8 |
+                       OXYGEN_2WIRE_INTERRUPT_MASK |
+                       OXYGEN_2WIRE_SPEED_FAST);
+
+        data->pcm179x.generic.anti_pop_delay = 100;
+        data->pcm179x.generic.output_enable_bit = GPIO_HDAV_OUTPUT_ENABLE;
+        data->pcm179x.generic.ext_power_reg = OXYGEN_GPI_DATA;
+        data->pcm179x.generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
+        data->pcm179x.generic.ext_power_bit = GPI_EXT_POWER;
+        data->pcm179x.dacs = chip->model.private_data ? 4 : 1;
+
+        pcm1796_init(chip);
+
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_INPUT_ROUTE);
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_INPUT_ROUTE);
+
+        xonar_init_cs53x1(chip);
+        xonar_init_ext_power(chip);
+        xonar_hdmi_init(chip, &data->hdmi);
+        xonar_enable_output(chip);
+
+        snd_component_add(chip->card, "PCM1796");
+        snd_component_add(chip->card, "CS5381");
+}
+
+static void xonar_st_init_i2c(struct oxygen *chip)
+{
+        oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
+                       OXYGEN_2WIRE_LENGTH_8 |
+                       OXYGEN_2WIRE_INTERRUPT_MASK |
+                       OXYGEN_2WIRE_SPEED_FAST);
+}
+
+static void xonar_st_init_common(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        data->generic.anti_pop_delay = 100;
+        data->generic.output_enable_bit = GPIO_ST_OUTPUT_ENABLE;
+        data->dacs = chip->model.private_data ? 4 : 1;
+        data->hp_gain_offset = 2*-18;
+
+        pcm1796_init(chip);
+
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
+                          GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR | GPIO_ST_HP);
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
+                            GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR | GPIO_ST_HP);
+
+        xonar_init_cs53x1(chip);
+        xonar_enable_output(chip);
+
+        snd_component_add(chip->card, "PCM1792A");
+        snd_component_add(chip->card, "CS5381");
+}
+
+static void cs2000_registers_init(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        cs2000_write(chip, CS2000_GLOBAL_CFG, CS2000_FREEZE);
+        cs2000_write(chip, CS2000_DEV_CTRL, 0);
+        cs2000_write(chip, CS2000_DEV_CFG_1,
+                     CS2000_R_MOD_SEL_1 |
+                     (0 << CS2000_R_SEL_SHIFT) |
+                     CS2000_AUX_OUT_SRC_REF_CLK |
+                     CS2000_EN_DEV_CFG_1);
+        cs2000_write(chip, CS2000_DEV_CFG_2,
+                     (0 << CS2000_LOCK_CLK_SHIFT) |
+                     CS2000_FRAC_N_SRC_STATIC);
+        cs2000_write(chip, CS2000_RATIO_0 + 0, 0x00); /* 1.0 */
+        cs2000_write(chip, CS2000_RATIO_0 + 1, 0x10);
+        cs2000_write(chip, CS2000_RATIO_0 + 2, 0x00);
+        cs2000_write(chip, CS2000_RATIO_0 + 3, 0x00);
+        cs2000_write(chip, CS2000_FUN_CFG_1, data->cs2000_fun_cfg_1);
+        cs2000_write(chip, CS2000_FUN_CFG_2, 0);
+        cs2000_write(chip, CS2000_GLOBAL_CFG, CS2000_EN_DEV_CFG_2);
+}
+
+static void xonar_st_init(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        data->has_cs2000 = 1;
+        data->cs2000_fun_cfg_1 = CS2000_REF_CLK_DIV_1;
+
+        oxygen_write16(chip, OXYGEN_I2S_A_FORMAT,
+                       OXYGEN_RATE_48000 | OXYGEN_I2S_FORMAT_I2S |
+                       OXYGEN_I2S_MCLK_128 | OXYGEN_I2S_BITS_16 |
+                       OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64);
+
+        xonar_st_init_i2c(chip);
+        cs2000_registers_init(chip);
+        xonar_st_init_common(chip);
+
+        snd_component_add(chip->card, "CS2000");
+}
+
+static void xonar_stx_init(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        xonar_st_init_i2c(chip);
+        data->generic.ext_power_reg = OXYGEN_GPI_DATA;
+        data->generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
+        data->generic.ext_power_bit = GPI_EXT_POWER;
+        xonar_init_ext_power(chip);
+        xonar_st_init_common(chip);
+}
+
+static void xonar_d2_cleanup(struct oxygen *chip)
+{
+        xonar_disable_output(chip);
+}
+
+static void xonar_hdav_cleanup(struct oxygen *chip)
+{
+        xonar_hdmi_cleanup(chip);
+        xonar_disable_output(chip);
+        msleep(2);
+}
+
+static void xonar_st_cleanup(struct oxygen *chip)
+{
+        xonar_disable_output(chip);
+}
+
+static void xonar_d2_suspend(struct oxygen *chip)
+{
+        xonar_d2_cleanup(chip);
+}
+
+static void xonar_hdav_suspend(struct oxygen *chip)
+{
+        xonar_hdav_cleanup(chip);
+}
+
+static void xonar_st_suspend(struct oxygen *chip)
+{
+        xonar_st_cleanup(chip);
+}
+
+static void xonar_d2_resume(struct oxygen *chip)
+{
+        pcm1796_registers_init(chip);
+        xonar_enable_output(chip);
+}
+
+static void xonar_hdav_resume(struct oxygen *chip)
+{
+        struct xonar_hdav *data = chip->model_data;
+
+        pcm1796_registers_init(chip);
+        xonar_hdmi_resume(chip, &data->hdmi);
+        xonar_enable_output(chip);
+}
+
+static void xonar_stx_resume(struct oxygen *chip)
+{
+        pcm1796_registers_init(chip);
+        xonar_enable_output(chip);
+}
+
+static void xonar_st_resume(struct oxygen *chip)
+{
+        cs2000_registers_init(chip);
+        xonar_stx_resume(chip);
+}
+
+static unsigned int mclk_from_rate(struct oxygen *chip, unsigned int rate)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        if (rate <= 32000)
+                return OXYGEN_I2S_MCLK_512;
+        else if (rate <= 48000 && data->os_128)
+                return OXYGEN_I2S_MCLK_512;
+        else if (rate <= 96000)
+                return OXYGEN_I2S_MCLK_256;
+        else
+                return OXYGEN_I2S_MCLK_128;
+}
+
+static unsigned int get_pcm1796_i2s_mclk(struct oxygen *chip,
+                                         unsigned int channel,
+                                         struct snd_pcm_hw_params *params)
+{
+        if (channel == PCM_MULTICH)
+                return mclk_from_rate(chip, params_rate(params));
+        else
+                return oxygen_default_i2s_mclk(chip, channel, params);
+}
+
+static void update_pcm1796_oversampling(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+        unsigned int i;
+        u8 reg;
+
+        if (data->current_rate <= 32000)
+                reg = PCM1796_OS_128;
+        else if (data->current_rate <= 48000 && data->os_128)
+                reg = PCM1796_OS_128;
+        else if (data->current_rate <= 96000 || data->os_128)
+                reg = PCM1796_OS_64;
+        else
+                reg = PCM1796_OS_32;
+        for (i = 0; i < data->dacs; ++i)
+                pcm1796_write_cached(chip, i, 20, reg);
+}
+
+static void set_pcm1796_params(struct oxygen *chip,
+                               struct snd_pcm_hw_params *params)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+
+        data->current_rate = params_rate(params);
+        update_pcm1796_oversampling(chip);
+}
+
+static void update_pcm1796_volume(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+        unsigned int i;
+        s8 gain_offset;
+
+        gain_offset = data->hp_active ? data->hp_gain_offset : 0;
+        for (i = 0; i < data->dacs; ++i) {
+                pcm1796_write_cached(chip, i, 16, chip->dac_volume[i * 2]
+                                     + gain_offset);
+                pcm1796_write_cached(chip, i, 17, chip->dac_volume[i * 2 + 1]
+                                     + gain_offset);
+        }
+}
+
+static void update_pcm1796_mute(struct oxygen *chip)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+        unsigned int i;
+        u8 value;
+
+        value = PCM1796_DMF_DISABLED | PCM1796_FMT_24_LJUST | PCM1796_ATLD;
+        if (chip->dac_mute)
+                value |= PCM1796_MUTE;
+        for (i = 0; i < data->dacs; ++i)
+                pcm1796_write_cached(chip, i, 18, value);
+}
+
+static void update_cs2000_rate(struct oxygen *chip, unsigned int rate)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+        u8 rate_mclk, reg;
+
+        switch (rate) {
+                /* XXX Why is the I2S A MCLK half the actual I2S MCLK? */
+        case 32000:
+                rate_mclk = OXYGEN_RATE_32000 | OXYGEN_I2S_MCLK_256;
+                break;
+        case 44100:
+                if (data->os_128)
+                        rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_256;
+                else
+                        rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_128;
+                break;
+        default: /* 48000 */
+                if (data->os_128)
+                        rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_256;
+                else
+                        rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_128;
+                break;
+        case 64000:
+                rate_mclk = OXYGEN_RATE_32000 | OXYGEN_I2S_MCLK_256;
+                break;
+        case 88200:
+                rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_256;
+                break;
+        case 96000:
+                rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_256;
+                break;
+        case 176400:
+                rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_256;
+                break;
+        case 192000:
+                rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_256;
+                break;
+        }
+        oxygen_write16_masked(chip, OXYGEN_I2S_A_FORMAT, rate_mclk,
+                              OXYGEN_I2S_RATE_MASK | OXYGEN_I2S_MCLK_MASK);
+        if ((rate_mclk & OXYGEN_I2S_MCLK_MASK) <= OXYGEN_I2S_MCLK_128)
+                reg = CS2000_REF_CLK_DIV_1;
+        else
+                reg = CS2000_REF_CLK_DIV_2;
+        cs2000_write_cached(chip, CS2000_FUN_CFG_1, reg);
+}
+
+static void set_st_params(struct oxygen *chip,
+                          struct snd_pcm_hw_params *params)
+{
+        update_cs2000_rate(chip, params_rate(params));
+        set_pcm1796_params(chip, params);
+}
+
+static void set_hdav_params(struct oxygen *chip,
+                            struct snd_pcm_hw_params *params)
+{
+        struct xonar_hdav *data = chip->model_data;
+
+        set_pcm1796_params(chip, params);
+        xonar_set_hdmi_params(chip, &data->hdmi, params);
+}
+
+static const struct snd_kcontrol_new alt_switch = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Analog Loopback Switch",
+        .info = snd_ctl_boolean_mono_info,
+        .get = xonar_gpio_bit_switch_get,
+        .put = xonar_gpio_bit_switch_put,
+        .private_value = GPIO_D2_ALT,
+};
+
+static int rolloff_info(struct snd_kcontrol *ctl,
+                        struct snd_ctl_elem_info *info)
+{
+        static const char *const names[2] = {
+                "Sharp Roll-off", "Slow Roll-off"
+        };
+
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = 1;
+        info->value.enumerated.items = 2;
+        if (info->value.enumerated.item >= 2)
+                info->value.enumerated.item = 1;
+        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
+        return 0;
+}
+
+static int rolloff_get(struct snd_kcontrol *ctl,
+                       struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_pcm179x *data = chip->model_data;
+
+        value->value.enumerated.item[0] =
+                (data->pcm1796_regs[0][19 - PCM1796_REG_BASE] &
+                 PCM1796_FLT_MASK) != PCM1796_FLT_SHARP;
+        return 0;
+}
+
+static int rolloff_put(struct snd_kcontrol *ctl,
+                       struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_pcm179x *data = chip->model_data;
+        unsigned int i;
+        int changed;
+        u8 reg;
+
+        mutex_lock(&chip->mutex);
+        reg = data->pcm1796_regs[0][19 - PCM1796_REG_BASE];
+        reg &= ~PCM1796_FLT_MASK;
+        if (!value->value.enumerated.item[0])
+                reg |= PCM1796_FLT_SHARP;
+        else
+                reg |= PCM1796_FLT_SLOW;
+        changed = reg != data->pcm1796_regs[0][19 - PCM1796_REG_BASE];
+        if (changed) {
+                for (i = 0; i < data->dacs; ++i)
+                        pcm1796_write(chip, i, 19, reg);
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static const struct snd_kcontrol_new rolloff_control = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "DAC Filter Playback Enum",
+        .info = rolloff_info,
+        .get = rolloff_get,
+        .put = rolloff_put,
+};
+
+static int os_128_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
+{
+        static const char *const names[2] = { "64x", "128x" };
+
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = 1;
+        info->value.enumerated.items = 2;
+        if (info->value.enumerated.item >= 2)
+                info->value.enumerated.item = 1;
+        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
+        return 0;
+}
+
+static int os_128_get(struct snd_kcontrol *ctl,
+                      struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_pcm179x *data = chip->model_data;
+
+        value->value.enumerated.item[0] = data->os_128;
+        return 0;
+}
+
+static int os_128_put(struct snd_kcontrol *ctl,
+                      struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_pcm179x *data = chip->model_data;
+        int changed;
+
+        mutex_lock(&chip->mutex);
+        changed = value->value.enumerated.item[0] != data->os_128;
+        if (changed) {
+                data->os_128 = value->value.enumerated.item[0];
+                if (data->has_cs2000)
+                        update_cs2000_rate(chip, data->current_rate);
+                oxygen_write16_masked(chip, OXYGEN_I2S_MULTICH_FORMAT,
+                                      mclk_from_rate(chip, data->current_rate),
+                                      OXYGEN_I2S_MCLK_MASK);
+                update_pcm1796_oversampling(chip);
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static const struct snd_kcontrol_new os_128_control = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "DAC Oversampling Playback Enum",
+        .info = os_128_info,
+        .get = os_128_get,
+        .put = os_128_put,
+};
+
+static int st_output_switch_info(struct snd_kcontrol *ctl,
+                                 struct snd_ctl_elem_info *info)
+{
+        static const char *const names[3] = {
+                "Speakers", "Headphones", "FP Headphones"
+        };
+
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = 1;
+        info->value.enumerated.items = 3;
+        if (info->value.enumerated.item >= 3)
+                info->value.enumerated.item = 2;
+        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
+        return 0;
+}
+
+static int st_output_switch_get(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        u16 gpio;
+
+        gpio = oxygen_read16(chip, OXYGEN_GPIO_DATA);
+        if (!(gpio & GPIO_ST_HP))
+                value->value.enumerated.item[0] = 0;
+        else if (gpio & GPIO_ST_HP_REAR)
+                value->value.enumerated.item[0] = 1;
+        else
+                value->value.enumerated.item[0] = 2;
+        return 0;
+}
+
+
+static int st_output_switch_put(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_pcm179x *data = chip->model_data;
+        u16 gpio_old, gpio;
+
+        mutex_lock(&chip->mutex);
+        gpio_old = oxygen_read16(chip, OXYGEN_GPIO_DATA);
+        gpio = gpio_old;
+        switch (value->value.enumerated.item[0]) {
+        case 0:
+                gpio &= ~(GPIO_ST_HP | GPIO_ST_HP_REAR);
+                break;
+        case 1:
+                gpio |= GPIO_ST_HP | GPIO_ST_HP_REAR;
+                break;
+        case 2:
+                gpio = (gpio | GPIO_ST_HP) & ~GPIO_ST_HP_REAR;
+                break;
+        }
+        oxygen_write16(chip, OXYGEN_GPIO_DATA, gpio);
+        data->hp_active = gpio & GPIO_ST_HP;
+        update_pcm1796_volume(chip);
+        mutex_unlock(&chip->mutex);
+        return gpio != gpio_old;
+}
+
+static int st_hp_volume_offset_info(struct snd_kcontrol *ctl,
+                                    struct snd_ctl_elem_info *info)
+{
+        static const char *const names[3] = {
+                "< 64 ohms", "64-300 ohms", "300-600 ohms"
+        };
+
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = 1;
+        info->value.enumerated.items = 3;
+        if (info->value.enumerated.item > 2)
+                info->value.enumerated.item = 2;
+        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
+        return 0;
+}
+
+static int st_hp_volume_offset_get(struct snd_kcontrol *ctl,
+                                   struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_pcm179x *data = chip->model_data;
+
+        mutex_lock(&chip->mutex);
+        if (data->hp_gain_offset < 2*-6)
+                value->value.enumerated.item[0] = 0;
+        else if (data->hp_gain_offset < 0)
+                value->value.enumerated.item[0] = 1;
+        else
+                value->value.enumerated.item[0] = 2;
+        mutex_unlock(&chip->mutex);
+        return 0;
+}
+
+
+static int st_hp_volume_offset_put(struct snd_kcontrol *ctl,
+                                   struct snd_ctl_elem_value *value)
+{
+        static const s8 offsets[] = { 2*-18, 2*-6, 0 };
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_pcm179x *data = chip->model_data;
+        s8 offset;
+        int changed;
+
+        if (value->value.enumerated.item[0] > 2)
+                return -EINVAL;
+        offset = offsets[value->value.enumerated.item[0]];
+        mutex_lock(&chip->mutex);
+        changed = offset != data->hp_gain_offset;
+        if (changed) {
+                data->hp_gain_offset = offset;
+                update_pcm1796_volume(chip);
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static const struct snd_kcontrol_new st_controls[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Analog Output",
+                .info = st_output_switch_info,
+                .get = st_output_switch_get,
+                .put = st_output_switch_put,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Headphones Impedance Playback Enum",
+                .info = st_hp_volume_offset_info,
+                .get = st_hp_volume_offset_get,
+                .put = st_hp_volume_offset_put,
+        },
+};
+
+static void xonar_line_mic_ac97_switch(struct oxygen *chip,
+                                       unsigned int reg, unsigned int mute)
+{
+        if (reg == AC97_LINE) {
+                spin_lock_irq(&chip->reg_lock);
+                oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                                      mute ? GPIO_INPUT_ROUTE : 0,
+                                      GPIO_INPUT_ROUTE);
+                spin_unlock_irq(&chip->reg_lock);
+        }
+}
+
+static const DECLARE_TLV_DB_SCALE(pcm1796_db_scale, -6000, 50, 0);
+
+static int xonar_d2_control_filter(struct snd_kcontrol_new *template)
+{
+        if (!strncmp(template->name, "CD Capture ", 11))
+                /* CD in is actually connected to the video in pin */
+                template->private_value ^= AC97_CD ^ AC97_VIDEO;
+        return 0;
+}
+
+static int xonar_st_control_filter(struct snd_kcontrol_new *template)
+{
+        if (!strncmp(template->name, "CD Capture ", 11))
+                return 1; /* no CD input */
+        return 0;
+}
+
+static int add_pcm1796_controls(struct oxygen *chip)
+{
+        int err;
+
+        err = snd_ctl_add(chip->card, snd_ctl_new1(&rolloff_control, chip));
+        if (err < 0)
+                return err;
+        err = snd_ctl_add(chip->card, snd_ctl_new1(&os_128_control, chip));
+        if (err < 0)
+                return err;
+        return 0;
+}
+
+static int xonar_d2_mixer_init(struct oxygen *chip)
+{
+        int err;
+
+        err = snd_ctl_add(chip->card, snd_ctl_new1(&alt_switch, chip));
+        if (err < 0)
+                return err;
+        err = add_pcm1796_controls(chip);
+        if (err < 0)
+                return err;
+        return 0;
+}
+
+static int xonar_hdav_mixer_init(struct oxygen *chip)
+{
+        return add_pcm1796_controls(chip);
+}
+
+static int xonar_st_mixer_init(struct oxygen *chip)
+{
+        unsigned int i;
+        int err;
+
+        for (i = 0; i < ARRAY_SIZE(st_controls); ++i) {
+                err = snd_ctl_add(chip->card,
+                                  snd_ctl_new1(&st_controls[i], chip));
+                if (err < 0)
+                        return err;
+        }
+        err = add_pcm1796_controls(chip);
+        if (err < 0)
+                return err;
+        return 0;
+}
+
+static const struct oxygen_model model_xonar_d2 = {
+        .longname = "Asus Virtuoso 200",
+        .chip = "AV200",
+        .init = xonar_d2_init,
+        .control_filter = xonar_d2_control_filter,
+        .mixer_init = xonar_d2_mixer_init,
+        .cleanup = xonar_d2_cleanup,
+        .suspend = xonar_d2_suspend,
+        .resume = xonar_d2_resume,
+        .get_i2s_mclk = get_pcm1796_i2s_mclk,
+        .set_dac_params = set_pcm1796_params,
+        .set_adc_params = xonar_set_cs53x1_params,
+        .update_dac_volume = update_pcm1796_volume,
+        .update_dac_mute = update_pcm1796_mute,
+        .dac_tlv = pcm1796_db_scale,
+        .model_data_size = sizeof(struct xonar_pcm179x),
+        .device_config = PLAYBACK_0_TO_I2S |
+                         PLAYBACK_1_TO_SPDIF |
+                         CAPTURE_0_FROM_I2S_2 |
+                         CAPTURE_1_FROM_SPDIF |
+                         MIDI_OUTPUT |
+                         MIDI_INPUT,
+        .dac_channels = 8,
+        .dac_volume_min = 255 - 2*60,
+        .dac_volume_max = 255,
+        .misc_flags = OXYGEN_MISC_MIDI,
+        .function_flags = OXYGEN_FUNCTION_SPI |
+                          OXYGEN_FUNCTION_ENABLE_SPI_4_5,
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+};
+
+static const struct oxygen_model model_xonar_hdav = {
+        .longname = "Asus Virtuoso 200",
+        .chip = "AV200",
+        .init = xonar_hdav_init,
+        .mixer_init = xonar_hdav_mixer_init,
+        .cleanup = xonar_hdav_cleanup,
+        .suspend = xonar_hdav_suspend,
+        .resume = xonar_hdav_resume,
+        .pcm_hardware_filter = xonar_hdmi_pcm_hardware_filter,
+        .get_i2s_mclk = get_pcm1796_i2s_mclk,
+        .set_dac_params = set_hdav_params,
+        .set_adc_params = xonar_set_cs53x1_params,
+        .update_dac_volume = update_pcm1796_volume,
+        .update_dac_mute = update_pcm1796_mute,
+        .uart_input = xonar_hdmi_uart_input,
+        .ac97_switch = xonar_line_mic_ac97_switch,
+        .dac_tlv = pcm1796_db_scale,
+        .model_data_size = sizeof(struct xonar_hdav),
+        .device_config = PLAYBACK_0_TO_I2S |
+                         PLAYBACK_1_TO_SPDIF |
+                         CAPTURE_0_FROM_I2S_2 |
+                         CAPTURE_1_FROM_SPDIF,
+        .dac_channels = 8,
+        .dac_volume_min = 255 - 2*60,
+        .dac_volume_max = 255,
+        .misc_flags = OXYGEN_MISC_MIDI,
+        .function_flags = OXYGEN_FUNCTION_2WIRE,
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+};
+
+static const struct oxygen_model model_xonar_st = {
+        .longname = "Asus Virtuoso 100",
+        .chip = "AV200",
+        .init = xonar_st_init,
+        .control_filter = xonar_st_control_filter,
+        .mixer_init = xonar_st_mixer_init,
+        .cleanup = xonar_st_cleanup,
+        .suspend = xonar_st_suspend,
+        .resume = xonar_st_resume,
+        .get_i2s_mclk = get_pcm1796_i2s_mclk,
+        .set_dac_params = set_st_params,
+        .set_adc_params = xonar_set_cs53x1_params,
+        .update_dac_volume = update_pcm1796_volume,
+        .update_dac_mute = update_pcm1796_mute,
+        .ac97_switch = xonar_line_mic_ac97_switch,
+        .dac_tlv = pcm1796_db_scale,
+        .model_data_size = sizeof(struct xonar_pcm179x),
+        .device_config = PLAYBACK_0_TO_I2S |
+                         PLAYBACK_1_TO_SPDIF |
+                         CAPTURE_0_FROM_I2S_2,
+        .dac_channels = 2,
+        .dac_volume_min = 255 - 2*60,
+        .dac_volume_max = 255,
+        .function_flags = OXYGEN_FUNCTION_2WIRE,
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+};
+
+int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
+                                      const struct pci_device_id *id)
+{
+        switch (id->subdevice) {
+        case 0x8269:
+                chip->model = model_xonar_d2;
+                chip->model.shortname = "Xonar D2";
+                break;
+        case 0x82b7:
+                chip->model = model_xonar_d2;
+                chip->model.shortname = "Xonar D2X";
+                chip->model.init = xonar_d2x_init;
+                break;
+        case 0x8314:
+                chip->model = model_xonar_hdav;
+                oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DB_MASK);
+                switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_DB_MASK) {
+                default:
+                        chip->model.shortname = "Xonar HDAV1.3";
+                        break;
+                case GPIO_DB_H6:
+                        chip->model.shortname = "Xonar HDAV1.3+H6";
+                        chip->model.private_data = 1;
+                        break;
+                }
+                break;
+        case 0x835d:
+                chip->model = model_xonar_st;
+                oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DB_MASK);
+                switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_DB_MASK) {
+                default:
+                        chip->model.shortname = "Xonar ST";
+                        break;
+                case GPIO_DB_H6:
+                        chip->model.shortname = "Xonar ST+H6";
+                        chip->model.dac_channels = 8;
+                        chip->model.private_data = 1;
+                        break;
+                }
+                break;
+        case 0x835c:
+                chip->model = model_xonar_st;
+                chip->model.shortname = "Xonar STX";
+                chip->model.init = xonar_stx_init;
+                chip->model.resume = xonar_stx_resume;
+                chip->model.set_dac_params = set_pcm1796_params;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
new file mode 100644
index 000000000000..dbc4b89d74e4
--- /dev/null
+++ b/sound/pci/oxygen/xonar_wm87x6.c
@@ -0,0 +1,1021 @@
+/*
+ * card driver for models with WM8776/WM8766 DACs (Xonar DS)
+ *
+ * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
+ *
+ *
+ *  This driver is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License, version 2.
+ *
+ *  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 driver; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Xonar DS
+ * --------
+ *
+ * CMI8788:
+ *
+ * SPI 0 -> WM8766 (surround, center/LFE, back)
+ * SPI 1 -> WM8776 (front, input)
+ *
+ * GPIO 4 <- headphone detect
+ * GPIO 6 -> route input jack to input 1/2 (1/0)
+ * GPIO 7 -> enable output to speakers
+ * GPIO 8 -> enable output to speakers
+ */
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <sound/control.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/tlv.h>
+#include "xonar.h"
+#include "wm8776.h"
+#include "wm8766.h"
+
+#define GPIO_DS_HP_DETECT       0x0010
+#define GPIO_DS_INPUT_ROUTE     0x0040
+#define GPIO_DS_OUTPUT_ENABLE   0x0180
+
+#define LC_CONTROL_LIMITER      0x40000000
+#define LC_CONTROL_ALC          0x20000000
+
+struct xonar_wm87x6 {
+        struct xonar_generic generic;
+        u16 wm8776_regs[0x17];
+        u16 wm8766_regs[0x10];
+        struct snd_kcontrol *lc_controls[13];
+};
+
+static void wm8776_write(struct oxygen *chip,
+                         unsigned int reg, unsigned int value)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
+                         OXYGEN_SPI_DATA_LENGTH_2 |
+                         OXYGEN_SPI_CLOCK_160 |
+                         (1 << OXYGEN_SPI_CODEC_SHIFT) |
+                         OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
+                         (reg << 9) | value);
+        if (reg < ARRAY_SIZE(data->wm8776_regs)) {
+                if (reg >= WM8776_HPLVOL && reg <= WM8776_DACMASTER)
+                        value &= ~WM8776_UPDATE;
+                data->wm8776_regs[reg] = value;
+        }
+}
+
+static void wm8776_write_cached(struct oxygen *chip,
+                                unsigned int reg, unsigned int value)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        if (reg >= ARRAY_SIZE(data->wm8776_regs) ||
+            value != data->wm8776_regs[reg])
+                wm8776_write(chip, reg, value);
+}
+
+static void wm8766_write(struct oxygen *chip,
+                         unsigned int reg, unsigned int value)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
+                         OXYGEN_SPI_DATA_LENGTH_2 |
+                         OXYGEN_SPI_CLOCK_160 |
+                         (0 << OXYGEN_SPI_CODEC_SHIFT) |
+                         OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
+                         (reg << 9) | value);
+        if (reg < ARRAY_SIZE(data->wm8766_regs))
+                data->wm8766_regs[reg] = value;
+}
+
+static void wm8766_write_cached(struct oxygen *chip,
+                                unsigned int reg, unsigned int value)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        if (reg >= ARRAY_SIZE(data->wm8766_regs) ||
+            value != data->wm8766_regs[reg]) {
+                if ((reg >= WM8766_LDA1 && reg <= WM8766_RDA1) ||
+                    (reg >= WM8766_LDA2 && reg <= WM8766_MASTDA))
+                        value &= ~WM8766_UPDATE;
+                wm8766_write(chip, reg, value);
+        }
+}
+
+static void wm8776_registers_init(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        wm8776_write(chip, WM8776_RESET, 0);
+        wm8776_write(chip, WM8776_DACCTRL1, WM8776_DZCEN |
+                     WM8776_PL_LEFT_LEFT | WM8776_PL_RIGHT_RIGHT);
+        wm8776_write(chip, WM8776_DACMUTE, chip->dac_mute ? WM8776_DMUTE : 0);
+        wm8776_write(chip, WM8776_DACIFCTRL,
+                     WM8776_DACFMT_LJUST | WM8776_DACWL_24);
+        wm8776_write(chip, WM8776_ADCIFCTRL,
+                     data->wm8776_regs[WM8776_ADCIFCTRL]);
+        wm8776_write(chip, WM8776_MSTRCTRL, data->wm8776_regs[WM8776_MSTRCTRL]);
+        wm8776_write(chip, WM8776_PWRDOWN, data->wm8776_regs[WM8776_PWRDOWN]);
+        wm8776_write(chip, WM8776_HPLVOL, data->wm8776_regs[WM8776_HPLVOL]);
+        wm8776_write(chip, WM8776_HPRVOL, data->wm8776_regs[WM8776_HPRVOL] |
+                     WM8776_UPDATE);
+        wm8776_write(chip, WM8776_ADCLVOL, data->wm8776_regs[WM8776_ADCLVOL]);
+        wm8776_write(chip, WM8776_ADCRVOL, data->wm8776_regs[WM8776_ADCRVOL]);
+        wm8776_write(chip, WM8776_ADCMUX, data->wm8776_regs[WM8776_ADCMUX]);
+        wm8776_write(chip, WM8776_DACLVOL, chip->dac_volume[0]);
+        wm8776_write(chip, WM8776_DACRVOL, chip->dac_volume[1] | WM8776_UPDATE);
+}
+
+static void wm8766_registers_init(struct oxygen *chip)
+{
+        wm8766_write(chip, WM8766_RESET, 0);
+        wm8766_write(chip, WM8766_INT_CTRL, WM8766_FMT_LJUST | WM8766_IWL_24);
+        wm8766_write(chip, WM8766_DAC_CTRL2,
+                     WM8766_ZCD | (chip->dac_mute ? WM8766_DMUTE_MASK : 0));
+        wm8766_write(chip, WM8766_LDA1, chip->dac_volume[2]);
+        wm8766_write(chip, WM8766_RDA1, chip->dac_volume[3]);
+        wm8766_write(chip, WM8766_LDA2, chip->dac_volume[4]);
+        wm8766_write(chip, WM8766_RDA2, chip->dac_volume[5]);
+        wm8766_write(chip, WM8766_LDA3, chip->dac_volume[6]);
+        wm8766_write(chip, WM8766_RDA3, chip->dac_volume[7] | WM8766_UPDATE);
+}
+
+static void wm8776_init(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        data->wm8776_regs[WM8776_HPLVOL] = (0x79 - 60) | WM8776_HPZCEN;
+        data->wm8776_regs[WM8776_HPRVOL] = (0x79 - 60) | WM8776_HPZCEN;
+        data->wm8776_regs[WM8776_ADCIFCTRL] =
+                WM8776_ADCFMT_LJUST | WM8776_ADCWL_24 | WM8776_ADCMCLK;
+        data->wm8776_regs[WM8776_MSTRCTRL] =
+                WM8776_ADCRATE_256 | WM8776_DACRATE_256;
+        data->wm8776_regs[WM8776_PWRDOWN] = WM8776_HPPD;
+        data->wm8776_regs[WM8776_ADCLVOL] = 0xa5 | WM8776_ZCA;
+        data->wm8776_regs[WM8776_ADCRVOL] = 0xa5 | WM8776_ZCA;
+        data->wm8776_regs[WM8776_ADCMUX] = 0x001;
+        wm8776_registers_init(chip);
+}
+
+static void xonar_ds_init(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        data->generic.anti_pop_delay = 300;
+        data->generic.output_enable_bit = GPIO_DS_OUTPUT_ENABLE;
+
+        wm8776_init(chip);
+        wm8766_registers_init(chip);
+
+        oxygen_write16_masked(chip, OXYGEN_GPIO_CONTROL, GPIO_DS_INPUT_ROUTE,
+                              GPIO_DS_HP_DETECT | GPIO_DS_INPUT_ROUTE);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, GPIO_DS_INPUT_ROUTE);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_INTERRUPT_MASK, GPIO_DS_HP_DETECT);
+        chip->interrupt_mask |= OXYGEN_INT_GPIO;
+
+        xonar_enable_output(chip);
+
+        snd_component_add(chip->card, "WM8776");
+        snd_component_add(chip->card, "WM8766");
+}
+
+static void xonar_ds_cleanup(struct oxygen *chip)
+{
+        xonar_disable_output(chip);
+}
+
+static void xonar_ds_suspend(struct oxygen *chip)
+{
+        xonar_ds_cleanup(chip);
+}
+
+static void xonar_ds_resume(struct oxygen *chip)
+{
+        wm8776_registers_init(chip);
+        wm8766_registers_init(chip);
+        xonar_enable_output(chip);
+}
+
+static void wm8776_adc_hardware_filter(unsigned int channel,
+                                       struct snd_pcm_hardware *hardware)
+{
+        if (channel == PCM_A) {
+                hardware->rates = SNDRV_PCM_RATE_32000 |
+                                  SNDRV_PCM_RATE_44100 |
+                                  SNDRV_PCM_RATE_48000 |
+                                  SNDRV_PCM_RATE_64000 |
+                                  SNDRV_PCM_RATE_88200 |
+                                  SNDRV_PCM_RATE_96000;
+                hardware->rate_max = 96000;
+        }
+}
+
+static void set_wm87x6_dac_params(struct oxygen *chip,
+                                  struct snd_pcm_hw_params *params)
+{
+}
+
+static void set_wm8776_adc_params(struct oxygen *chip,
+                                  struct snd_pcm_hw_params *params)
+{
+        u16 reg;
+
+        reg = WM8776_ADCRATE_256 | WM8776_DACRATE_256;
+        if (params_rate(params) > 48000)
+                reg |= WM8776_ADCOSR;
+        wm8776_write_cached(chip, WM8776_MSTRCTRL, reg);
+}
+
+static void update_wm8776_volume(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+        u8 to_change;
+
+        if (chip->dac_volume[0] == chip->dac_volume[1]) {
+                if (chip->dac_volume[0] != data->wm8776_regs[WM8776_DACLVOL] ||
+                    chip->dac_volume[1] != data->wm8776_regs[WM8776_DACRVOL]) {
+                        wm8776_write(chip, WM8776_DACMASTER,
+                                     chip->dac_volume[0] | WM8776_UPDATE);
+                        data->wm8776_regs[WM8776_DACLVOL] = chip->dac_volume[0];
+                        data->wm8776_regs[WM8776_DACRVOL] = chip->dac_volume[0];
+                }
+        } else {
+                to_change = (chip->dac_volume[0] !=
+                             data->wm8776_regs[WM8776_DACLVOL]) << 0;
+                to_change |= (chip->dac_volume[1] !=
+                              data->wm8776_regs[WM8776_DACLVOL]) << 1;
+                if (to_change & 1)
+                        wm8776_write(chip, WM8776_DACLVOL, chip->dac_volume[0] |
+                                     ((to_change & 2) ? 0 : WM8776_UPDATE));
+                if (to_change & 2)
+                        wm8776_write(chip, WM8776_DACRVOL,
+                                     chip->dac_volume[1] | WM8776_UPDATE);
+        }
+}
+
+static void update_wm87x6_volume(struct oxygen *chip)
+{
+        static const u8 wm8766_regs[6] = {
+                WM8766_LDA1, WM8766_RDA1,
+                WM8766_LDA2, WM8766_RDA2,
+                WM8766_LDA3, WM8766_RDA3,
+        };
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int i;
+        u8 to_change;
+
+        update_wm8776_volume(chip);
+        if (chip->dac_volume[2] == chip->dac_volume[3] &&
+            chip->dac_volume[2] == chip->dac_volume[4] &&
+            chip->dac_volume[2] == chip->dac_volume[5] &&
+            chip->dac_volume[2] == chip->dac_volume[6] &&
+            chip->dac_volume[2] == chip->dac_volume[7]) {
+                to_change = 0;
+                for (i = 0; i < 6; ++i)
+                        if (chip->dac_volume[2] !=
+                            data->wm8766_regs[wm8766_regs[i]])
+                                to_change = 1;
+                if (to_change) {
+                        wm8766_write(chip, WM8766_MASTDA,
+                                     chip->dac_volume[2] | WM8766_UPDATE);
+                        for (i = 0; i < 6; ++i)
+                                data->wm8766_regs[wm8766_regs[i]] =
+                                        chip->dac_volume[2];
+                }
+        } else {
+                to_change = 0;
+                for (i = 0; i < 6; ++i)
+                        to_change |= (chip->dac_volume[2 + i] !=
+                                      data->wm8766_regs[wm8766_regs[i]]) << i;
+                for (i = 0; i < 6; ++i)
+                        if (to_change & (1 << i))
+                                wm8766_write(chip, wm8766_regs[i],
+                                             chip->dac_volume[2 + i] |
+                                             ((to_change & (0x3e << i))
+                                              ? 0 : WM8766_UPDATE));
+        }
+}
+
+static void update_wm8776_mute(struct oxygen *chip)
+{
+        wm8776_write_cached(chip, WM8776_DACMUTE,
+                            chip->dac_mute ? WM8776_DMUTE : 0);
+}
+
+static void update_wm87x6_mute(struct oxygen *chip)
+{
+        update_wm8776_mute(chip);
+        wm8766_write_cached(chip, WM8766_DAC_CTRL2, WM8766_ZCD |
+                            (chip->dac_mute ? WM8766_DMUTE_MASK : 0));
+}
+
+static void xonar_ds_gpio_changed(struct oxygen *chip)
+{
+        u16 bits;
+
+        bits = oxygen_read16(chip, OXYGEN_GPIO_DATA);
+        snd_printk(KERN_INFO "HP detect: %d\n", !!(bits & GPIO_DS_HP_DETECT));
+}
+
+static int wm8776_bit_switch_get(struct snd_kcontrol *ctl,
+                                 struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+        u16 bit = ctl->private_value & 0xffff;
+        unsigned int reg_index = (ctl->private_value >> 16) & 0xff;
+        bool invert = (ctl->private_value >> 24) & 1;
+
+        value->value.integer.value[0] =
+                ((data->wm8776_regs[reg_index] & bit) != 0) ^ invert;
+        return 0;
+}
+
+static int wm8776_bit_switch_put(struct snd_kcontrol *ctl,
+                                 struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+        u16 bit = ctl->private_value & 0xffff;
+        u16 reg_value;
+        unsigned int reg_index = (ctl->private_value >> 16) & 0xff;
+        bool invert = (ctl->private_value >> 24) & 1;
+        int changed;
+
+        mutex_lock(&chip->mutex);
+        reg_value = data->wm8776_regs[reg_index] & ~bit;
+        if (value->value.integer.value[0] ^ invert)
+                reg_value |= bit;
+        changed = reg_value != data->wm8776_regs[reg_index];
+        if (changed)
+                wm8776_write(chip, reg_index, reg_value);
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static int wm8776_field_enum_info(struct snd_kcontrol *ctl,
+                                  struct snd_ctl_elem_info *info)
+{
+        static const char *const hld[16] = {
+                "0 ms", "2.67 ms", "5.33 ms", "10.6 ms",
+                "21.3 ms", "42.7 ms", "85.3 ms", "171 ms",
+                "341 ms", "683 ms", "1.37 s", "2.73 s",
+                "5.46 s", "10.9 s", "21.8 s", "43.7 s",
+        };
+        static const char *const atk_lim[11] = {
+                "0.25 ms", "0.5 ms", "1 ms", "2 ms",
+                "4 ms", "8 ms", "16 ms", "32 ms",
+                "64 ms", "128 ms", "256 ms",
+        };
+        static const char *const atk_alc[11] = {
+                "8.40 ms", "16.8 ms", "33.6 ms", "67.2 ms",
+                "134 ms", "269 ms", "538 ms", "1.08 s",
+                "2.15 s", "4.3 s", "8.6 s",
+        };
+        static const char *const dcy_lim[11] = {
+                "1.2 ms", "2.4 ms", "4.8 ms", "9.6 ms",
+                "19.2 ms", "38.4 ms", "76.8 ms", "154 ms",
+                "307 ms", "614 ms", "1.23 s",
+        };
+        static const char *const dcy_alc[11] = {
+                "33.5 ms", "67.0 ms", "134 ms", "268 ms",
+                "536 ms", "1.07 s", "2.14 s", "4.29 s",
+                "8.58 s", "17.2 s", "34.3 s",
+        };
+        static const char *const tranwin[8] = {
+                "0 us", "62.5 us", "125 us", "250 us",
+                "500 us", "1 ms", "2 ms", "4 ms",
+        };
+        u8 max;
+        const char *const *names;
+
+        max = (ctl->private_value >> 12) & 0xf;
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = 1;
+        info->value.enumerated.items = max + 1;
+        if (info->value.enumerated.item > max)
+                info->value.enumerated.item = max;
+        switch ((ctl->private_value >> 24) & 0x1f) {
+        case WM8776_ALCCTRL2:
+                names = hld;
+                break;
+        case WM8776_ALCCTRL3:
+                if (((ctl->private_value >> 20) & 0xf) == 0) {
+                        if (ctl->private_value & LC_CONTROL_LIMITER)
+                                names = atk_lim;
+                        else
+                                names = atk_alc;
+                } else {
+                        if (ctl->private_value & LC_CONTROL_LIMITER)
+                                names = dcy_lim;
+                        else
+                                names = dcy_alc;
+                }
+                break;
+        case WM8776_LIMITER:
+                names = tranwin;
+                break;
+        default:
+                return -ENXIO;
+        }
+        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
+        return 0;
+}
+
+static int wm8776_field_volume_info(struct snd_kcontrol *ctl,
+                                    struct snd_ctl_elem_info *info)
+{
+        info->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        info->count = 1;
+        info->value.integer.min = (ctl->private_value >> 8) & 0xf;
+        info->value.integer.max = (ctl->private_value >> 12) & 0xf;
+        return 0;
+}
+
+static void wm8776_field_set_from_ctl(struct snd_kcontrol *ctl)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int value, reg_index, mode;
+        u8 min, max, shift;
+        u16 mask, reg_value;
+        bool invert;
+
+        if ((data->wm8776_regs[WM8776_ALCCTRL1] & WM8776_LCSEL_MASK) ==
+            WM8776_LCSEL_LIMITER)
+                mode = LC_CONTROL_LIMITER;
+        else
+                mode = LC_CONTROL_ALC;
+        if (!(ctl->private_value & mode))
+                return;
+
+        value = ctl->private_value & 0xf;
+        min = (ctl->private_value >> 8) & 0xf;
+        max = (ctl->private_value >> 12) & 0xf;
+        mask = (ctl->private_value >> 16) & 0xf;
+        shift = (ctl->private_value >> 20) & 0xf;
+        reg_index = (ctl->private_value >> 24) & 0x1f;
+        invert = (ctl->private_value >> 29) & 0x1;
+
+        if (invert)
+                value = max - (value - min);
+        reg_value = data->wm8776_regs[reg_index];
+        reg_value &= ~(mask << shift);
+        reg_value |= value << shift;
+        wm8776_write_cached(chip, reg_index, reg_value);
+}
+
+static int wm8776_field_set(struct snd_kcontrol *ctl, unsigned int value)
+{
+        struct oxygen *chip = ctl->private_data;
+        u8 min, max;
+        int changed;
+
+        min = (ctl->private_value >> 8) & 0xf;
+        max = (ctl->private_value >> 12) & 0xf;
+        if (value < min || value > max)
+                return -EINVAL;
+        mutex_lock(&chip->mutex);
+        changed = value != (ctl->private_value & 0xf);
+        if (changed) {
+                ctl->private_value = (ctl->private_value & ~0xf) | value;
+                wm8776_field_set_from_ctl(ctl);
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static int wm8776_field_enum_get(struct snd_kcontrol *ctl,
+                                 struct snd_ctl_elem_value *value)
+{
+        value->value.enumerated.item[0] = ctl->private_value & 0xf;
+        return 0;
+}
+
+static int wm8776_field_volume_get(struct snd_kcontrol *ctl,
+                                   struct snd_ctl_elem_value *value)
+{
+        value->value.integer.value[0] = ctl->private_value & 0xf;
+        return 0;
+}
+
+static int wm8776_field_enum_put(struct snd_kcontrol *ctl,
+                                 struct snd_ctl_elem_value *value)
+{
+        return wm8776_field_set(ctl, value->value.enumerated.item[0]);
+}
+
+static int wm8776_field_volume_put(struct snd_kcontrol *ctl,
+                                   struct snd_ctl_elem_value *value)
+{
+        return wm8776_field_set(ctl, value->value.integer.value[0]);
+}
+
+static int wm8776_hp_vol_info(struct snd_kcontrol *ctl,
+                              struct snd_ctl_elem_info *info)
+{
+        info->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        info->count = 2;
+        info->value.integer.min = 0x79 - 60;
+        info->value.integer.max = 0x7f;
+        return 0;
+}
+
+static int wm8776_hp_vol_get(struct snd_kcontrol *ctl,
+                             struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        mutex_lock(&chip->mutex);
+        value->value.integer.value[0] =
+                data->wm8776_regs[WM8776_HPLVOL] & WM8776_HPATT_MASK;
+        value->value.integer.value[1] =
+                data->wm8776_regs[WM8776_HPRVOL] & WM8776_HPATT_MASK;
+        mutex_unlock(&chip->mutex);
+        return 0;
+}
+
+static int wm8776_hp_vol_put(struct snd_kcontrol *ctl,
+                             struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+        u8 to_update;
+
+        mutex_lock(&chip->mutex);
+        to_update = (value->value.integer.value[0] !=
+                     (data->wm8776_regs[WM8776_HPLVOL] & WM8776_HPATT_MASK))
+                << 0;
+        to_update |= (value->value.integer.value[1] !=
+                      (data->wm8776_regs[WM8776_HPRVOL] & WM8776_HPATT_MASK))
+                << 1;
+        if (value->value.integer.value[0] == value->value.integer.value[1]) {
+                if (to_update) {
+                        wm8776_write(chip, WM8776_HPMASTER,
+                                     value->value.integer.value[0] |
+                                     WM8776_HPZCEN | WM8776_UPDATE);
+                        data->wm8776_regs[WM8776_HPLVOL] =
+                                value->value.integer.value[0] | WM8776_HPZCEN;
+                        data->wm8776_regs[WM8776_HPRVOL] =
+                                value->value.integer.value[0] | WM8776_HPZCEN;
+                }
+        } else {
+                if (to_update & 1)
+                        wm8776_write(chip, WM8776_HPLVOL,
+                                     value->value.integer.value[0] |
+                                     WM8776_HPZCEN |
+                                     ((to_update & 2) ? 0 : WM8776_UPDATE));
+                if (to_update & 2)
+                        wm8776_write(chip, WM8776_HPRVOL,
+                                     value->value.integer.value[1] |
+                                     WM8776_HPZCEN | WM8776_UPDATE);
+        }
+        mutex_unlock(&chip->mutex);
+        return to_update != 0;
+}
+
+static int wm8776_input_mux_get(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int mux_bit = ctl->private_value;
+
+        value->value.integer.value[0] =
+                !!(data->wm8776_regs[WM8776_ADCMUX] & mux_bit);
+        return 0;
+}
+
+static int wm8776_input_mux_put(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int mux_bit = ctl->private_value;
+        u16 reg;
+        int changed;
+
+        mutex_lock(&chip->mutex);
+        reg = data->wm8776_regs[WM8776_ADCMUX];
+        if (value->value.integer.value[0]) {
+                reg &= ~0x003;
+                reg |= mux_bit;
+        } else
+                reg &= ~mux_bit;
+        changed = reg != data->wm8776_regs[WM8776_ADCMUX];
+        if (changed) {
+                oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                                      reg & 1 ? GPIO_DS_INPUT_ROUTE : 0,
+                                      GPIO_DS_INPUT_ROUTE);
+                wm8776_write(chip, WM8776_ADCMUX, reg);
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static int wm8776_input_vol_info(struct snd_kcontrol *ctl,
+                                 struct snd_ctl_elem_info *info)
+{
+        info->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        info->count = 2;
+        info->value.integer.min = 0xa5;
+        info->value.integer.max = 0xff;
+        return 0;
+}
+
+static int wm8776_input_vol_get(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        mutex_lock(&chip->mutex);
+        value->value.integer.value[0] =
+                data->wm8776_regs[WM8776_ADCLVOL] & WM8776_AGMASK;
+        value->value.integer.value[1] =
+                data->wm8776_regs[WM8776_ADCRVOL] & WM8776_AGMASK;
+        mutex_unlock(&chip->mutex);
+        return 0;
+}
+
+static int wm8776_input_vol_put(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+        int changed = 0;
+
+        mutex_lock(&chip->mutex);
+        changed = (value->value.integer.value[0] !=
+                   (data->wm8776_regs[WM8776_ADCLVOL] & WM8776_AGMASK)) ||
+                  (value->value.integer.value[1] !=
+                   (data->wm8776_regs[WM8776_ADCRVOL] & WM8776_AGMASK));
+        wm8776_write_cached(chip, WM8776_ADCLVOL,
+                            value->value.integer.value[0] | WM8776_ZCA);
+        wm8776_write_cached(chip, WM8776_ADCRVOL,
+                            value->value.integer.value[1] | WM8776_ZCA);
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static int wm8776_level_control_info(struct snd_kcontrol *ctl,
+                                     struct snd_ctl_elem_info *info)
+{
+        static const char *const names[3] = {
+                "None", "Peak Limiter", "Automatic Level Control"
+        };
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = 1;
+        info->value.enumerated.items = 3;
+        if (info->value.enumerated.item >= 3)
+                info->value.enumerated.item = 2;
+        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
+        return 0;
+}
+
+static int wm8776_level_control_get(struct snd_kcontrol *ctl,
+                                    struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        if (!(data->wm8776_regs[WM8776_ALCCTRL2] & WM8776_LCEN))
+                value->value.enumerated.item[0] = 0;
+        else if ((data->wm8776_regs[WM8776_ALCCTRL1] & WM8776_LCSEL_MASK) ==
+                 WM8776_LCSEL_LIMITER)
+                value->value.enumerated.item[0] = 1;
+        else
+                value->value.enumerated.item[0] = 2;
+        return 0;
+}
+
+static void activate_control(struct oxygen *chip,
+                             struct snd_kcontrol *ctl, unsigned int mode)
+{
+        unsigned int access;
+
+        if (ctl->private_value & mode)
+                access = 0;
+        else
+                access = SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+        if ((ctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_INACTIVE) != access) {
+                ctl->vd[0].access ^= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_INFO, &ctl->id);
+        }
+}
+
+static int wm8776_level_control_put(struct snd_kcontrol *ctl,
+                                    struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int mode = 0, i;
+        u16 ctrl1, ctrl2;
+        int changed;
+
+        if (value->value.enumerated.item[0] >= 3)
+                return -EINVAL;
+        mutex_lock(&chip->mutex);
+        changed = value->value.enumerated.item[0] != ctl->private_value;
+        if (changed) {
+                ctl->private_value = value->value.enumerated.item[0];
+                ctrl1 = data->wm8776_regs[WM8776_ALCCTRL1];
+                ctrl2 = data->wm8776_regs[WM8776_ALCCTRL2];
+                switch (value->value.enumerated.item[0]) {
+                default:
+                        wm8776_write_cached(chip, WM8776_ALCCTRL2,
+                                            ctrl2 & ~WM8776_LCEN);
+                        break;
+                case 1:
+                        wm8776_write_cached(chip, WM8776_ALCCTRL1,
+                                            (ctrl1 & ~WM8776_LCSEL_MASK) |
+                                            WM8776_LCSEL_LIMITER);
+                        wm8776_write_cached(chip, WM8776_ALCCTRL2,
+                                            ctrl2 | WM8776_LCEN);
+                        mode = LC_CONTROL_LIMITER;
+                        break;
+                case 2:
+                        wm8776_write_cached(chip, WM8776_ALCCTRL1,
+                                            (ctrl1 & ~WM8776_LCSEL_MASK) |
+                                            WM8776_LCSEL_ALC_STEREO);
+                        wm8776_write_cached(chip, WM8776_ALCCTRL2,
+                                            ctrl2 | WM8776_LCEN);
+                        mode = LC_CONTROL_ALC;
+                        break;
+                }
+                for (i = 0; i < ARRAY_SIZE(data->lc_controls); ++i)
+                        activate_control(chip, data->lc_controls[i], mode);
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static int hpf_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
+{
+        static const char *const names[2] = {
+                "None", "High-pass Filter"
+        };
+
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = 1;
+        info->value.enumerated.items = 2;
+        if (info->value.enumerated.item >= 2)
+                info->value.enumerated.item = 1;
+        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
+        return 0;
+}
+
+static int hpf_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        value->value.enumerated.item[0] =
+                !(data->wm8776_regs[WM8776_ADCIFCTRL] & WM8776_ADCHPD);
+        return 0;
+}
+
+static int hpf_put(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int reg;
+        int changed;
+
+        mutex_lock(&chip->mutex);
+        reg = data->wm8776_regs[WM8776_ADCIFCTRL] & ~WM8776_ADCHPD;
+        if (!value->value.enumerated.item[0])
+                reg |= WM8776_ADCHPD;
+        changed = reg != data->wm8776_regs[WM8776_ADCIFCTRL];
+        if (changed)
+                wm8776_write(chip, WM8776_ADCIFCTRL, reg);
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+#define WM8776_BIT_SWITCH(xname, reg, bit, invert, flags) { \
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .info = snd_ctl_boolean_mono_info, \
+        .get = wm8776_bit_switch_get, \
+        .put = wm8776_bit_switch_put, \
+        .private_value = ((reg) << 16) | (bit) | ((invert) << 24) | (flags), \
+}
+#define _WM8776_FIELD_CTL(xname, reg, shift, initval, min, max, mask, flags) \
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .private_value = (initval) | ((min) << 8) | ((max) << 12) | \
+        ((mask) << 16) | ((shift) << 20) | ((reg) << 24) | (flags)
+#define WM8776_FIELD_CTL_ENUM(xname, reg, shift, init, min, max, mask, flags) {\
+        _WM8776_FIELD_CTL(xname " Capture Enum", \
+                          reg, shift, init, min, max, mask, flags), \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \
+                  SNDRV_CTL_ELEM_ACCESS_INACTIVE, \
+        .info = wm8776_field_enum_info, \
+        .get = wm8776_field_enum_get, \
+        .put = wm8776_field_enum_put, \
+}
+#define WM8776_FIELD_CTL_VOLUME(a, b, c, d, e, f, g, h, tlv_p) { \
+        _WM8776_FIELD_CTL(a " Capture Volume", b, c, d, e, f, g, h), \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \
+                  SNDRV_CTL_ELEM_ACCESS_INACTIVE | \
+                  SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
+        .info = wm8776_field_volume_info, \
+        .get = wm8776_field_volume_get, \
+        .put = wm8776_field_volume_put, \
+        .tlv = { .p = tlv_p }, \
+}
+
+static const DECLARE_TLV_DB_SCALE(wm87x6_dac_db_scale, -6000, 50, 0);
+static const DECLARE_TLV_DB_SCALE(wm8776_adc_db_scale, -2100, 50, 0);
+static const DECLARE_TLV_DB_SCALE(wm8776_hp_db_scale, -6000, 100, 0);
+static const DECLARE_TLV_DB_SCALE(wm8776_lct_db_scale, -1600, 100, 0);
+static const DECLARE_TLV_DB_SCALE(wm8776_maxgain_db_scale, 0, 400, 0);
+static const DECLARE_TLV_DB_SCALE(wm8776_ngth_db_scale, -7800, 600, 0);
+static const DECLARE_TLV_DB_SCALE(wm8776_maxatten_lim_db_scale, -1200, 100, 0);
+static const DECLARE_TLV_DB_SCALE(wm8776_maxatten_alc_db_scale, -2100, 400, 0);
+
+static const struct snd_kcontrol_new ds_controls[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Headphone Playback Volume",
+                .info = wm8776_hp_vol_info,
+                .get = wm8776_hp_vol_get,
+                .put = wm8776_hp_vol_put,
+                .tlv = { .p = wm8776_hp_db_scale },
+        },
+        WM8776_BIT_SWITCH("Headphone Playback Switch",
+                          WM8776_PWRDOWN, WM8776_HPPD, 1, 0),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input Capture Volume",
+                .info = wm8776_input_vol_info,
+                .get = wm8776_input_vol_get,
+                .put = wm8776_input_vol_put,
+                .tlv = { .p = wm8776_adc_db_scale },
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Line Capture Switch",
+                .info = snd_ctl_boolean_mono_info,
+                .get = wm8776_input_mux_get,
+                .put = wm8776_input_mux_put,
+                .private_value = 1 << 0,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Mic Capture Switch",
+                .info = snd_ctl_boolean_mono_info,
+                .get = wm8776_input_mux_get,
+                .put = wm8776_input_mux_put,
+                .private_value = 1 << 1,
+        },
+        WM8776_BIT_SWITCH("Aux", WM8776_ADCMUX, 1 << 2, 0, 0),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "ADC Filter Capture Enum",
+                .info = hpf_info,
+                .get = hpf_get,
+                .put = hpf_put,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Level Control Capture Enum",
+                .info = wm8776_level_control_info,
+                .get = wm8776_level_control_get,
+                .put = wm8776_level_control_put,
+                .private_value = 0,
+        },
+};
+static const struct snd_kcontrol_new lc_controls[] = {
+        WM8776_FIELD_CTL_VOLUME("Limiter Threshold",
+                                WM8776_ALCCTRL1, 0, 11, 0, 15, 0xf,
+                                LC_CONTROL_LIMITER, wm8776_lct_db_scale),
+        WM8776_FIELD_CTL_ENUM("Limiter Attack Time",
+                              WM8776_ALCCTRL3, 0, 2, 0, 10, 0xf,
+                              LC_CONTROL_LIMITER),
+        WM8776_FIELD_CTL_ENUM("Limiter Decay Time",
+                              WM8776_ALCCTRL3, 4, 3, 0, 10, 0xf,
+                              LC_CONTROL_LIMITER),
+        WM8776_FIELD_CTL_ENUM("Limiter Transient Window",
+                              WM8776_LIMITER, 4, 2, 0, 7, 0x7,
+                              LC_CONTROL_LIMITER),
+        WM8776_FIELD_CTL_VOLUME("Limiter Maximum Attenuation",
+                                WM8776_LIMITER, 0, 6, 3, 12, 0xf,
+                                LC_CONTROL_LIMITER,
+                                wm8776_maxatten_lim_db_scale),
+        WM8776_FIELD_CTL_VOLUME("ALC Target Level",
+                                WM8776_ALCCTRL1, 0, 11, 0, 15, 0xf,
+                                LC_CONTROL_ALC, wm8776_lct_db_scale),
+        WM8776_FIELD_CTL_ENUM("ALC Attack Time",
+                              WM8776_ALCCTRL3, 0, 2, 0, 10, 0xf,
+                              LC_CONTROL_ALC),
+        WM8776_FIELD_CTL_ENUM("ALC Decay Time",
+                              WM8776_ALCCTRL3, 4, 3, 0, 10, 0xf,
+                              LC_CONTROL_ALC),
+        WM8776_FIELD_CTL_VOLUME("ALC Maximum Gain",
+                                WM8776_ALCCTRL1, 4, 7, 1, 7, 0x7,
+                                LC_CONTROL_ALC, wm8776_maxgain_db_scale),
+        WM8776_FIELD_CTL_VOLUME("ALC Maximum Attenuation",
+                                WM8776_LIMITER, 0, 10, 10, 15, 0xf,
+                                LC_CONTROL_ALC, wm8776_maxatten_alc_db_scale),
+        WM8776_FIELD_CTL_ENUM("ALC Hold Time",
+                              WM8776_ALCCTRL2, 0, 0, 0, 15, 0xf,
+                              LC_CONTROL_ALC),
+        WM8776_BIT_SWITCH("Noise Gate Capture Switch",
+                          WM8776_NOISEGATE, WM8776_NGAT, 0,
+                          LC_CONTROL_ALC),
+        WM8776_FIELD_CTL_VOLUME("Noise Gate Threshold",
+                                WM8776_NOISEGATE, 2, 0, 0, 7, 0x7,
+                                LC_CONTROL_ALC, wm8776_ngth_db_scale),
+};
+
+static int xonar_ds_control_filter(struct snd_kcontrol_new *template)
+{
+        if (!strncmp(template->name, "CD Capture ", 11))
+                return 1; /* no CD input */
+        return 0;
+}
+
+static int xonar_ds_mixer_init(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int i;
+        struct snd_kcontrol *ctl;
+        int err;
+
+        for (i = 0; i < ARRAY_SIZE(ds_controls); ++i) {
+                ctl = snd_ctl_new1(&ds_controls[i], chip);
+                if (!ctl)
+                        return -ENOMEM;
+                err = snd_ctl_add(chip->card, ctl);
+                if (err < 0)
+                        return err;
+        }
+        BUILD_BUG_ON(ARRAY_SIZE(lc_controls) != ARRAY_SIZE(data->lc_controls));
+        for (i = 0; i < ARRAY_SIZE(lc_controls); ++i) {
+                ctl = snd_ctl_new1(&lc_controls[i], chip);
+                if (!ctl)
+                        return -ENOMEM;
+                err = snd_ctl_add(chip->card, ctl);
+                if (err < 0)
+                        return err;
+                data->lc_controls[i] = ctl;
+        }
+        return 0;
+}
+
+static const struct oxygen_model model_xonar_ds = {
+        .shortname = "Xonar DS",
+        .longname = "Asus Virtuoso 200",
+        .chip = "AV200",
+        .init = xonar_ds_init,
+        .control_filter = xonar_ds_control_filter,
+        .mixer_init = xonar_ds_mixer_init,
+        .cleanup = xonar_ds_cleanup,
+        .suspend = xonar_ds_suspend,
+        .resume = xonar_ds_resume,
+        .pcm_hardware_filter = wm8776_adc_hardware_filter,
+        .get_i2s_mclk = oxygen_default_i2s_mclk,
+        .set_dac_params = set_wm87x6_dac_params,
+        .set_adc_params = set_wm8776_adc_params,
+        .update_dac_volume = update_wm87x6_volume,
+        .update_dac_mute = update_wm87x6_mute,
+        .gpio_changed = xonar_ds_gpio_changed,
+        .dac_tlv = wm87x6_dac_db_scale,
+        .model_data_size = sizeof(struct xonar_wm87x6),
+        .device_config = PLAYBACK_0_TO_I2S |
+                         PLAYBACK_1_TO_SPDIF |
+                         CAPTURE_0_FROM_I2S_1,
+        .dac_channels = 8,
+        .dac_volume_min = 255 - 2*60,
+        .dac_volume_max = 255,
+        .function_flags = OXYGEN_FUNCTION_SPI,
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+};
+
+int __devinit get_xonar_wm87x6_model(struct oxygen *chip,
+                                     const struct pci_device_id *id)
+{
+        switch (id->subdevice) {
+        case 0x838e:
+                chip->model = model_xonar_ds;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 833e9c7b27c7..95cfde27d25c 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -94,7 +94,7 @@ enum {
         PCI_ID_LAST
 };
 
-static struct pci_device_id pcxhr_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(pcxhr_ids) = {
         { 0x10b5, 0x9656, 0x1369, 0xb001, 0, 0, PCI_ID_VX882HR, },
         { 0x10b5, 0x9656, 0x1369, 0xb101, 0, 0, PCI_ID_PCX882HR, },
         { 0x10b5, 0x9656, 0x1369, 0xb201, 0, 0, PCI_ID_VX881HR, },
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index b5ca02e2038c..ad4462677615 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -506,7 +506,7 @@ static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip);
 /*
  */
 
-static struct pci_device_id snd_riptide_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_riptide_ids) = {
         { PCI_DEVICE(0x127a, 0x4310) },
         { PCI_DEVICE(0x127a, 0x4320) },
         { PCI_DEVICE(0x127a, 0x4330) },
@@ -515,7 +515,7 @@ static struct pci_device_id snd_riptide_ids[] = {
 };
 
 #ifdef SUPPORT_JOYSTICK
-static struct pci_device_id snd_riptide_joystick_ids[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(snd_riptide_joystick_ids) = {
         { PCI_DEVICE(0x127a, 0x4312) },
         { PCI_DEVICE(0x127a, 0x4322) },
         { PCI_DEVICE(0x127a, 0x4332) },
@@ -1058,7 +1058,7 @@ setsamplerate(struct cmdif *cif, unsigned char *intdec, unsigned int rate)
                                  rptr.retwords[2] != M &&
                                  rptr.retwords[3] != N &&
                                  i++ < MAX_WRITE_RETRY);
-                        if (i == MAX_WRITE_RETRY) {
+                        if (i > MAX_WRITE_RETRY) {
                                 snd_printdd("sent samplerate %d: %d failed\n",
                                             *intdec, rate);
                                 return -EIO;
@@ -1974,9 +1974,9 @@ snd_riptide_proc_read(struct snd_info_entry *entry,
         }
         snd_iprintf(buffer, "Paths:\n");
         i = getpaths(cif, p);
-        while (i--) {
-                snd_iprintf(buffer, "%x->%x ", p[i - 1], p[i]);
-                i--;
+        while (i >= 2) {
+                i -= 2;
+                snd_iprintf(buffer, "%x->%x ", p[i], p[i + 1]);
         }
         snd_iprintf(buffer, "\n");
 }
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index f977dba7cbd0..3c04524de37c 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -70,10 +70,10 @@
 
 
 #include <linux/delay.h>
+#include <linux/gfp.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 
 #include <sound/core.h>
@@ -226,7 +226,7 @@ struct rme32 {
         struct snd_kcontrol *spdif_ctl;
 };
 
-static struct pci_device_id snd_rme32_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_rme32_ids) = {
         {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32), 0,},
         {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_8), 0,},
         {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_PRO), 0,},
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 2ba5c0fd55db..d19dc052c391 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -27,7 +27,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 
 #include <sound/core.h>
@@ -231,7 +230,7 @@ struct rme96 {
         struct snd_kcontrol   *spdif_ctl;
 };
 
-static struct pci_device_id snd_rme96_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_rme96_ids) = {
         { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96), 0, },
         { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8), 0, },
         { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PRO), 0, },
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 7bb827c7d806..b92adef8e81e 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -24,7 +24,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
@@ -585,7 +584,7 @@ static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_d
 }
 
 
-static struct pci_device_id snd_hdsp_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_hdsp_ids) = {
         {
                 .vendor = PCI_VENDOR_ID_XILINX,
                 .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP,
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 0dce331a2a3b..547b713d7204 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -512,7 +512,7 @@ static char channel_map_madi_ss[HDSPM_MAX_CHANNELS] = {
 };
 
 
-static struct pci_device_id snd_hdspm_ids[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(snd_hdspm_ids) = {
         {
          .vendor = PCI_VENDOR_ID_XILINX,
          .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI,
@@ -2479,7 +2479,7 @@ static int snd_hdspm_put_qs_wire(struct snd_kcontrol *kcontrol,
    on MADICARD 
   - playback mixer matrix: [channelout+64] [output] [value]
   - input(thru) mixer matrix: [channelin] [output] [value]
-  (better do 2 kontrols for seperation ?)
+  (better do 2 kontrols for separation ?)
 */
 
 #define HDSPM_MIXER(xname, xindex) \
@@ -3017,7 +3017,7 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                 insel = "Coaxial";
                 break;
         default:
-                insel = "Unkown";
+                insel = "Unknown";
         }
 
         switch (hdspm->control_register & HDSPM_SyncRefMask) {
@@ -3028,7 +3028,7 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                 syncref = "MADI";
                 break;
         default:
-                syncref = "Unkown";
+                syncref = "Unknown";
         }
         snd_iprintf(buffer, "Inputsel = %s, SyncRef = %s\n", insel,
                     syncref);
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index bc539abb2105..c492af5b25f3 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -24,7 +24,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/slab.h>
 #include <linux/moduleparam.h>
 
 #include <sound/core.h>
@@ -314,7 +313,7 @@ static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_d
 }
 
 
-static struct pci_device_id snd_rme9652_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_rme9652_ids) = {
         {
                 .vendor    = 0x10ee,
                 .device    = 0x3fc4,
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index 1a5ff0611072..9cc1b5aa0148 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -24,6 +24,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/time.h>
+#include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
@@ -48,7 +49,7 @@ MODULE_PARM_DESC(id, "ID string for SiS7019 Audio Accelerator.");
 module_param(enable, bool, 0444);
 MODULE_PARM_DESC(enable, "Enable SiS7019 Audio Accelerator.");
 
-static struct pci_device_id snd_sis7019_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_sis7019_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x7019) },
         { 0, }
 };
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 1f6406c4534d..337b9facadfd 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -242,7 +242,7 @@ struct sonicvibes {
 #endif
 };
 
-static struct pci_device_id snd_sonic_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_sonic_ids) = {
         { PCI_VDEVICE(S3, 0xca00), 0, },
         { 0, }
 };
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index 21cef97d478d..6d0581841d7a 100644
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -62,7 +62,7 @@ MODULE_PARM_DESC(pcm_channels, "Number of hardware channels assigned for PCM.");
 module_param_array(wavetable_size, int, NULL, 0444);
 MODULE_PARM_DESC(wavetable_size, "Maximum memory size in kB for wavetable synth.");
 
-static struct pci_device_id snd_trident_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_trident_ids) = {
         {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX), 
                 PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
         {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_NX), 
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 8a332d2f615c..7e494b6a1d0e 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -401,7 +401,7 @@ struct via82xx {
 #endif
 };
 
-static struct pci_device_id snd_via82xx_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_via82xx_ids) = {
         /* 0x1106, 0x3058 */
         { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686_5), TYPE_CARD_VIA686, },    /* 686A */
         /* 0x1106, 0x3059 */
@@ -1791,6 +1791,12 @@ static struct ac97_quirk ac97_quirks[] = {
                 .type = AC97_TUNE_HP_ONLY
         },
         {
+                .subvendor = 0x110a,
+                .subdevice = 0x0079,
+                .name = "Fujitsu Siemens D1289",
+                .type = AC97_TUNE_HP_ONLY
+        },
+        {
                 .subvendor = 0x1019,
                 .subdevice = 0x0a81,
                 .name = "ECS K7VTA3",
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 47eb61561dfc..f7e8bbbe3953 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -260,7 +260,7 @@ struct via82xx_modem {
         struct snd_info_entry *proc_entry;
 };
 
-static struct pci_device_id snd_via82xx_modem_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_via82xx_modem_ids) = {
         { PCI_VDEVICE(VIA, 0x3068), TYPE_CARD_VIA82XX_MODEM, },
         { 0, }
 };
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index fc9136c3e0d7..99a9a814be0b 100644
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -60,7 +60,7 @@ enum {
         VX_PCI_VX222_NEW
 };
 
-static struct pci_device_id snd_vx222_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_vx222_ids) = {
         { 0x10b5, 0x9050, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, },   /* PLX */
         { 0x10b5, 0x9030, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, },   /* PLX */
         { 0, }
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index e6b18b90d451..80c682113381 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -66,7 +66,7 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address");
 module_param_array(rear_switch, bool, NULL, 0444);
 MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch");
 
-static struct pci_device_id snd_ymfpci_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_ymfpci_ids) = {
         { PCI_VDEVICE(YAMAHA, 0x0004), 0, },   /* YMF724 */
         { PCI_VDEVICE(YAMAHA, 0x000d), 0, },   /* YMF724F */
         { PCI_VDEVICE(YAMAHA, 0x000a), 0, },   /* YMF740 */