Merge branch 'master' into next

112 files changed, 4658 insertions, 2343 deletions

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 82b9bddcdcd6..ca25e6179d76 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -400,6 +400,26 @@ config SND_INDIGODJ
           To compile this driver as a module, choose M here: the module
           will be called snd-indigodj
 
+config SND_INDIGOIOX
+        tristate "(Echoaudio) Indigo IOx"
+        select FW_LOADER
+        select SND_PCM
+        help
+          Say 'Y' or 'M' to include support for Echoaudio Indigo IOx.
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-indigoiox
+
+config SND_INDIGODJX
+        tristate "(Echoaudio) Indigo DJx"
+        select FW_LOADER
+        select SND_PCM
+        help
+          Say 'Y' or 'M' to include support for Echoaudio Indigo DJx.
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-indigodjx
+
 config SND_EMU10K1
         tristate "Emu10k1 (SB Live!, Audigy, E-mu APS)"
         select FW_LOADER
@@ -744,7 +764,8 @@ config SND_VIRTUOSO
         select SND_OXYGEN_LIB
         help
           Say Y here to include support for sound cards based on the
-          Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2 and D2X.
+          Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, and
+          Essence STX.
           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 e2b843b4f9d0..97ee127ac33d 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -143,6 +143,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
 { 0x43525970, 0xfffffff8, "CS4202",             NULL,           NULL },
 { 0x43585421, 0xffffffff, "HSD11246",           NULL,           NULL }, // SmartMC II
 { 0x43585428, 0xfffffff8, "Cx20468",            patch_conexant, NULL }, // SmartAMC fixme: the mask might be different
+{ 0x43585430, 0xffffffff, "Cx20468-31",         patch_conexant, NULL },
 { 0x43585431, 0xffffffff, "Cx20551",           patch_cx20551,  NULL },
 { 0x44543031, 0xfffffff0, "DT0398",             NULL,           NULL },
 { 0x454d4328, 0xffffffff, "EM28028",            NULL,           NULL },  // same as TR28028?
@@ -383,7 +384,7 @@ int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned sho
 
 EXPORT_SYMBOL(snd_ac97_update_bits);
 
-/* no lock version - see snd_ac97_updat_bits() */
+/* no lock version - see snd_ac97_update_bits() */
 int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg,
                                 unsigned short mask, unsigned short value)
 {
@@ -1643,7 +1644,10 @@ static int snd_ac97_modem_build(struct snd_card *card, struct snd_ac97 * ac97)
 {
         int err, idx;
 
-        //printk("AC97_GPIO_CFG = %x\n",snd_ac97_read(ac97,AC97_GPIO_CFG));
+        /*
+        printk(KERN_DEBUG "AC97_GPIO_CFG = %x\n",
+               snd_ac97_read(ac97,AC97_GPIO_CFG));
+        */
         snd_ac97_write(ac97, AC97_GPIO_CFG, 0xffff & ~(AC97_GPIO_LINE1_OH));
         snd_ac97_write(ac97, AC97_GPIO_POLARITY, 0xffff & ~(AC97_GPIO_LINE1_OH));
         snd_ac97_write(ac97, AC97_GPIO_STICKY, 0xffff);
diff --git a/sound/pci/ac97/ac97_proc.c b/sound/pci/ac97/ac97_proc.c
index 060ea59d5f02..73b17d526c8b 100644
--- a/sound/pci/ac97/ac97_proc.c
+++ b/sound/pci/ac97/ac97_proc.c
@@ -125,6 +125,8 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe
         snd_iprintf(buffer, "PCI Subsys Device: 0x%04x\n\n",
                     ac97->subsystem_device);
 
+        snd_iprintf(buffer, "Flags: %x\n", ac97->flags);
+
         if ((ac97->ext_id & AC97_EI_REV_MASK) >= AC97_EI_REV_23) {
                 val = snd_ac97_read(ac97, AC97_INT_PAGING);
                 snd_ac97_update_bits(ac97, AC97_INT_PAGING,
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index a7f38e63303f..d1f242bd0ac5 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -995,10 +995,10 @@ snd_ad1889_probe(struct pci_dev *pci,
         }
 
         /* (2) */
-        card = snd_card_new(index[devno], id[devno], THIS_MODULE, 0);
+        err = snd_card_create(index[devno], id[devno], THIS_MODULE, 0, &card);
         /* XXX REVISIT: we can probably allocate chip in this call */
-        if (card == NULL)
-                return -ENOMEM;
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "AD1889");
         strcpy(card->shortname, "Analog Devices AD1889");
diff --git a/sound/pci/ak4531_codec.c b/sound/pci/ak4531_codec.c
index 0f819ddb3ebf..fd135e3d8a84 100644
--- a/sound/pci/ak4531_codec.c
+++ b/sound/pci/ak4531_codec.c
@@ -51,7 +51,8 @@ static void snd_ak4531_dump(struct snd_ak4531 *ak4531)
         int idx;
         
         for (idx = 0; idx < 0x19; idx++)
-                printk("ak4531 0x%x: 0x%x\n", idx, ak4531->regs[idx]);
+                printk(KERN_DEBUG "ak4531 0x%x: 0x%x\n",
+                       idx, ak4531->regs[idx]);
 }
 
 #endif
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 1a0fd65ec280..4edf270a7809 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2142,7 +2142,7 @@ static int __devinit snd_ali_resources(struct snd_ali *codec)
 {
         int err;
 
-        snd_ali_printk("resouces allocation ...\n");
+        snd_ali_printk("resources allocation ...\n");
         err = pci_request_regions(codec->pci, "ALI 5451");
         if (err < 0)
                 return err;
@@ -2154,7 +2154,7 @@ static int __devinit snd_ali_resources(struct snd_ali *codec)
                 return -EBUSY;
         }
         codec->irq = codec->pci->irq;
-        snd_ali_printk("resouces allocated.\n");
+        snd_ali_printk("resources allocated.\n");
         return 0;
 }
 static int snd_ali_dev_free(struct snd_device *device)
@@ -2307,9 +2307,9 @@ static int __devinit snd_ali_probe(struct pci_dev *pci,
 
         snd_ali_printk("probe ...\n");
 
-        card = snd_card_new(index, id, THIS_MODULE, 0);
-        if (!card)
-                return -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         err = snd_ali_create(card, pci, pcm_channels, spdif, &codec);
         if (err < 0)
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 8df6824b51cd..009b4c8225a5 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -91,7 +91,7 @@
 #define DEBUG_PLAY_REC  0
 
 #if DEBUG_CALLS
-#define snd_als300_dbgcalls(format, args...) printk(format, ##args)
+#define snd_als300_dbgcalls(format, args...) printk(KERN_DEBUG format, ##args)
 #define snd_als300_dbgcallenter() printk(KERN_ERR "--> %s\n", __func__)
 #define snd_als300_dbgcallleave() printk(KERN_ERR "<-- %s\n", __func__)
 #else
@@ -812,10 +812,10 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
 
-        if (card == NULL)
-                return -ENOMEM;
+        if (err < 0)
+                return err;
 
         chip_type = pci_id->driver_data;
 
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index ba570053d4d5..542a0c65a92c 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -889,12 +889,13 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci,
         pci_write_config_word(pci, PCI_COMMAND, word | PCI_COMMAND_IO);
         pci_set_master(pci);
         
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 
-                            sizeof(*acard) /* private_data: acard */);
-        if (card == NULL) {
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 
+                              sizeof(*acard) /* private_data: acard */,
+                              &card);
+        if (err < 0) {
                 pci_release_regions(pci);
                 pci_disable_device(pci);
-                return -ENOMEM;
+                return err;
         }
 
         acard = card->private_data;
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 226fe8237d31..9ce8548c03e4 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1645,9 +1645,9 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,
         struct atiixp *chip;
         int err;
 
-        card = snd_card_new(index, id, THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA");
         strcpy(card->shortname, "ATI IXP");
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 0e6e5cc1c501..c3136cccc559 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1288,9 +1288,9 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,
         struct atiixp_modem *chip;
         int err;
 
-        card = snd_card_new(index, id, THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "ATIIXP-MODEM");
         strcpy(card->shortname, "ATI IXP Modem");
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index a36d4d1fd419..9ec122383eef 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -250,9 +250,9 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                 return -ENOENT;
         }
         // (2)
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         // (3)
         if ((err = snd_vortex_create(card, pci, &chip)) < 0) {
diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c
index 649849e540d3..f4aa8ff6f5f9 100644
--- a/sound/pci/au88x0/au88x0_a3d.c
+++ b/sound/pci/au88x0/au88x0_a3d.c
@@ -462,9 +462,10 @@ static void a3dsrc_ZeroSliceIO(a3dsrc_t * a)
 /* Reset Single A3D source. */
 static void a3dsrc_ZeroState(a3dsrc_t * a)
 {
-
-        //printk("vortex: ZeroState slice: %d, source %d\n", a->slice, a->source);
-
+        /*
+        printk(KERN_DEBUG "vortex: ZeroState slice: %d, source %d\n",
+               a->slice, a->source);
+        */
         a3dsrc_SetAtmosState(a, 0, 0, 0, 0);
         a3dsrc_SetHrtfState(a, A3dHrirZeros, A3dHrirZeros);
         a3dsrc_SetItdDline(a, A3dItdDlineZeros);
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index b070e5714514..3906f5afe27a 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -1135,7 +1135,10 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,
                         snd_pcm_sgbuf_get_addr(dma->substream, 0));
                 break;
         }
-        //printk("vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n", dma->cfg0, dma->cfg1);
+        /*
+        printk(KERN_DEBUG "vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n",
+               dma->cfg0, dma->cfg1);
+        */
         hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG0 + (adbdma << 3), dma->cfg0);
         hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG1 + (adbdma << 3), dma->cfg1);
 
@@ -1959,7 +1962,7 @@ vortex_connect_codecplay(vortex_t * vortex, int en, unsigned char mixers[])
                                           ADB_CODECOUT(0 + 4));
                 vortex_connection_mix_adb(vortex, en, 0x11, mixers[3],
                                           ADB_CODECOUT(1 + 4));
-                //printk("SDAC detected ");
+                /* printk(KERN_DEBUG "SDAC detected "); */
         }
 #else
         // Use plain direct output to codec.
@@ -2013,7 +2016,11 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)
                                         resmap[restype] |= (1 << i);
                                 else
                                         vortex->dma_adb[i].resources[restype] |= (1 << i);
-                                //printk("vortex: ResManager: type %d out %d\n", restype, i);
+                                /*
+                                printk(KERN_DEBUG
+                                       "vortex: ResManager: type %d out %d\n",
+                                       restype, i);
+                                */
                                 return i;
                         }
                 }
@@ -2024,7 +2031,11 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)
                 for (i = 0; i < qty; i++) {
                         if (resmap[restype] & (1 << i)) {
                                 resmap[restype] &= ~(1 << i);
-                                //printk("vortex: ResManager: type %d in %d\n",restype, i);
+                                /*
+                                printk(KERN_DEBUG
+                                       "vortex: ResManager: type %d in %d\n",
+                                       restype, i);
+                                */
                                 return i;
                         }
                 }
@@ -2789,7 +2800,7 @@ vortex_translateformat(vortex_t * vortex, char bits, char nch, int encod)
 {
         int a, this_194;
 
-        if ((bits != 8) || (bits != 16))
+        if ((bits != 8) && (bits != 16))
                 return -1;
 
         switch (encod) {
diff --git a/sound/pci/au88x0/au88x0_synth.c b/sound/pci/au88x0/au88x0_synth.c
index 978b856f5621..2805e34bd41d 100644
--- a/sound/pci/au88x0/au88x0_synth.c
+++ b/sound/pci/au88x0/au88x0_synth.c
@@ -213,38 +213,59 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,
         switch (reg) {
                 /* Voice specific parameters */
         case 0:         /* running */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_RUN(wt), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_RUN(wt), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_RUN(wt), val);
                 return 0xc;
                 break;
         case 1:         /* param 0 */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,0), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_PARM(wt,0), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_PARM(wt, 0), val);
                 return 0xc;
                 break;
         case 2:         /* param 1 */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,1), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_PARM(wt,1), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_PARM(wt, 1), val);
                 return 0xc;
                 break;
         case 3:         /* param 2 */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,2), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_PARM(wt,2), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_PARM(wt, 2), val);
                 return 0xc;
                 break;
         case 4:         /* param 3 */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,3), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_PARM(wt,3), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_PARM(wt, 3), val);
                 return 0xc;
                 break;
         case 6:         /* mute */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_MUTE(wt), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_MUTE(wt), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_MUTE(wt), val);
                 return 0xc;
                 break;
         case 0xb:
                 {               /* delay */
-                        //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_DELAY(wt,0), (int)val);
+                        /*
+                        printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                               WT_DELAY(wt,0), (int)val);
+                        */
                         hwwrite(vortex->mmio, WT_DELAY(wt, 3), val);
                         hwwrite(vortex->mmio, WT_DELAY(wt, 2), val);
                         hwwrite(vortex->mmio, WT_DELAY(wt, 1), val);
@@ -272,7 +293,9 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,
                 return 0;
                 break;
         }
-        //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", ecx, (int)val);
+        /*
+        printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", ecx, (int)val);
+        */
         hwwrite(vortex->mmio, ecx, val);
         return 1;
 }
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index c7c54e7748e9..8eea29fc42fe 100644
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -368,9 +368,9 @@ static int __devinit snd_aw2_probe(struct pci_dev *pci,
         }
 
         /* (2) Create card instance */
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         /* (3) Create main component */
         err = snd_aw2_create(card, pci, &chip);
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 333007c523a1..e9e9b5821d41 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -211,25 +211,25 @@ MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}");
 #endif
 
 #if DEBUG_MIXER
-#define snd_azf3328_dbgmixer(format, args...) printk(format, ##args)
+#define snd_azf3328_dbgmixer(format, args...) printk(KERN_DEBUG format, ##args)
 #else
 #define snd_azf3328_dbgmixer(format, args...)
 #endif
 
 #if DEBUG_PLAY_REC
-#define snd_azf3328_dbgplay(format, args...) printk(KERN_ERR format, ##args)
+#define snd_azf3328_dbgplay(format, args...) printk(KERN_DEBUG format, ##args)
 #else
 #define snd_azf3328_dbgplay(format, args...)
 #endif
 
 #if DEBUG_MISC
-#define snd_azf3328_dbgtimer(format, args...) printk(KERN_ERR format, ##args)
+#define snd_azf3328_dbgtimer(format, args...) printk(KERN_DEBUG format, ##args)
 #else
 #define snd_azf3328_dbgtimer(format, args...)
 #endif
 
 #if DEBUG_GAME
-#define snd_azf3328_dbggame(format, args...) printk(KERN_ERR format, ##args)
+#define snd_azf3328_dbggame(format, args...) printk(KERN_DEBUG format, ##args)
 #else
 #define snd_azf3328_dbggame(format, args...)
 #endif
@@ -2216,9 +2216,9 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "AZF3328");
         strcpy(card->shortname, "Aztech AZF3328 (PCI168)");
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 1aa1c0402540..a299340519df 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -888,9 +888,9 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (!card)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         err = snd_bt87x_create(card, pci, &chip);
         if (err < 0)
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 0e62205d4081..df757575798a 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -255,6 +255,14 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
            .gpio_type = 2,
            .i2c_adc = 1,
            .spi_dac = 1 } ,
+        /* Giga-byte GA-G1975X mobo
+         * Novell bnc#395807
+         */
+        /* FIXME: the GPIO and I2C setting aren't tested well */
+        { .serial = 0x1458a006,
+          .name = "Giga-byte GA-G1975X",
+          .gpio_type = 1,
+          .i2c_adc = 1 },
          /* Shuttle XPC SD31P which has an onboard Creative Labs
           * Sound Blaster Live! 24-bit EAX
           * high-definition 7.1 audio processor".
@@ -404,7 +412,9 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu,
         }
 
         tmp = reg << 25 | value << 16;
-        // snd_printk("I2C-write:reg=0x%x, value=0x%x\n", reg, value);
+        /*
+        snd_printk(KERN_DEBUG "I2C-write:reg=0x%x, value=0x%x\n", reg, value);
+        */
         /* Not sure what this I2C channel controls. */
         /* snd_ca0106_ptr_write(emu, I2C_D0, 0, tmp); */
 
@@ -422,7 +432,7 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu,
                 /* Wait till the transaction ends */
                 while (1) {
                         status = snd_ca0106_ptr_read(emu, I2C_A, 0);
-                        //snd_printk("I2C:status=0x%x\n", status);
+                        /*snd_printk(KERN_DEBUG "I2C:status=0x%x\n", status);*/
                         timeout++;
                         if ((status & I2C_A_ADC_START) == 0)
                                 break;
@@ -521,7 +531,10 @@ static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substr
         channel->number = channel_id;
 
         channel->use = 1;
-        //printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, channel);
+        /*
+        printk(KERN_DEBUG "open:channel_id=%d, chip=%p, channel=%p\n",
+               channel_id, chip, channel);
+        */
         //channel->interrupt = snd_ca0106_pcm_channel_interrupt;
         channel->epcm = epcm;
         if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
@@ -614,7 +627,10 @@ static int snd_ca0106_pcm_open_capture_channel(struct snd_pcm_substream *substre
         channel->number = channel_id;
 
         channel->use = 1;
-        //printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, channel);
+        /*
+        printk(KERN_DEBUG "open:channel_id=%d, chip=%p, channel=%p\n",
+               channel_id, chip, channel);
+        */
         //channel->interrupt = snd_ca0106_pcm_channel_interrupt;
         channel->epcm = epcm;
         if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
@@ -705,9 +721,20 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)
         u32 reg71;
         int i;
         
-        //snd_printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, periods=%u, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size, runtime->periods, frames_to_bytes(runtime, 1));
-        //snd_printk("dma_addr=%x, dma_area=%p, table_base=%p\n",runtime->dma_addr, runtime->dma_area, table_base);
-        //snd_printk("dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",emu->buffer.addr, emu->buffer.area, emu->buffer.bytes);
+#if 0 /* debug */
+        snd_printk(KERN_DEBUG
+                   "prepare:channel_number=%d, rate=%d, format=0x%x, "
+                   "channels=%d, buffer_size=%ld, period_size=%ld, "
+                   "periods=%u, frames_to_bytes=%d\n",
+                   channel, runtime->rate, runtime->format,
+                   runtime->channels, runtime->buffer_size,
+                   runtime->period_size, runtime->periods,
+                   frames_to_bytes(runtime, 1));
+        snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, table_base=%p\n",
+                   runtime->dma_addr, runtime->dma_area, table_base);
+        snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",
+                   emu->buffer.addr, emu->buffer.area, emu->buffer.bytes);
+#endif /* debug */
         /* Rate can be set per channel. */
         /* reg40 control host to fifo */
         /* reg71 controls DAC rate. */
@@ -799,9 +826,20 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream)
         u32 reg71_set = 0;
         u32 reg71;
         
-        //snd_printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, periods=%u, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size, runtime->periods, frames_to_bytes(runtime, 1));
-        //snd_printk("dma_addr=%x, dma_area=%p, table_base=%p\n",runtime->dma_addr, runtime->dma_area, table_base);
-        //snd_printk("dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",emu->buffer.addr, emu->buffer.area, emu->buffer.bytes);
+#if 0 /* debug */
+        snd_printk(KERN_DEBUG
+                   "prepare:channel_number=%d, rate=%d, format=0x%x, "
+                   "channels=%d, buffer_size=%ld, period_size=%ld, "
+                   "periods=%u, frames_to_bytes=%d\n",
+                   channel, runtime->rate, runtime->format,
+                   runtime->channels, runtime->buffer_size,
+                   runtime->period_size, runtime->periods,
+                   frames_to_bytes(runtime, 1));
+        snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, table_base=%p\n",
+                   runtime->dma_addr, runtime->dma_area, table_base);
+        snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",
+                   emu->buffer.addr, emu->buffer.area, emu->buffer.bytes);
+#endif /* debug */
         /* reg71 controls ADC rate. */
         switch (runtime->rate) {
         case 44100:
@@ -846,7 +884,14 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream)
         }
 
 
-        //printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size,  frames_to_bytes(runtime, 1));
+        /*
+        printk(KERN_DEBUG
+               "prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, "
+               "buffer_size=%ld, period_size=%ld, frames_to_bytes=%d\n",
+               channel, runtime->rate, runtime->format, runtime->channels,
+               runtime->buffer_size, runtime->period_size,
+               frames_to_bytes(runtime, 1));
+        */
         snd_ca0106_ptr_write(emu, 0x13, channel, 0);
         snd_ca0106_ptr_write(emu, CAPTURE_DMA_ADDR, channel, runtime->dma_addr);
         snd_ca0106_ptr_write(emu, CAPTURE_BUFFER_SIZE, channel, frames_to_bytes(runtime, runtime->buffer_size)<<16); // buffer size in bytes
@@ -888,13 +933,13 @@ static int snd_ca0106_pcm_trigger_playback(struct snd_pcm_substream *substream,
                 runtime = s->runtime;
                 epcm = runtime->private_data;
                 channel = epcm->channel_id;
-                /* snd_printk("channel=%d\n",channel); */
+                /* snd_printk(KERN_DEBUG "channel=%d\n", channel); */
                 epcm->running = running;
                 basic |= (0x1 << channel);
                 extended |= (0x10 << channel);
                 snd_pcm_trigger_done(s, substream);
         }
-        /* snd_printk("basic=0x%x, extended=0x%x\n",basic, extended); */
+        /* snd_printk(KERN_DEBUG "basic=0x%x, extended=0x%x\n",basic, extended); */
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
@@ -972,8 +1017,13 @@ snd_ca0106_pcm_pointer_playback(struct snd_pcm_substream *substream)
         ptr=ptr2;
         if (ptr >= runtime->buffer_size)
                 ptr -= runtime->buffer_size;
-        //printk("ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n", ptr1, ptr2, ptr, (int)runtime->buffer_size, (int)runtime->period_size, (int)runtime->frame_bits, (int)runtime->rate);
-
+        /*
+        printk(KERN_DEBUG "ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, "
+               "buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n",
+               ptr1, ptr2, ptr, (int)runtime->buffer_size,
+               (int)runtime->period_size, (int)runtime->frame_bits,
+               (int)runtime->rate);
+        */
         return ptr;
 }
 
@@ -995,8 +1045,13 @@ snd_ca0106_pcm_pointer_capture(struct snd_pcm_substream *substream)
         ptr=ptr2;
         if (ptr >= runtime->buffer_size)
                 ptr -= runtime->buffer_size;
-        //printk("ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n", ptr1, ptr2, ptr, (int)runtime->buffer_size, (int)runtime->period_size, (int)runtime->frame_bits, (int)runtime->rate);
-
+        /*
+        printk(KERN_DEBUG "ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, "
+               "buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n",
+               ptr1, ptr2, ptr, (int)runtime->buffer_size,
+               (int)runtime->period_size, (int)runtime->frame_bits,
+               (int)runtime->rate);
+        */
         return ptr;
 }
 
@@ -1181,8 +1236,12 @@ static irqreturn_t snd_ca0106_interrupt(int irq, void *dev_id)
                 return IRQ_NONE;
 
         stat76 = snd_ca0106_ptr_read(chip, EXTENDED_INT, 0);
-        //snd_printk("interrupt status = 0x%08x, stat76=0x%08x\n", status, stat76);
-        //snd_printk("ptr=0x%08x\n",snd_ca0106_ptr_read(chip, PLAYBACK_POINTER, 0));
+        /*
+        snd_printk(KERN_DEBUG "interrupt status = 0x%08x, stat76=0x%08x\n",
+                   status, stat76);
+        snd_printk(KERN_DEBUG "ptr=0x%08x\n",
+                   snd_ca0106_ptr_read(chip, PLAYBACK_POINTER, 0));
+        */
         mask = 0x11; /* 0x1 for one half, 0x10 for the other half period. */
         for(i = 0; i < 4; i++) {
                 pchannel = &(chip->playback_channels[i]);
@@ -1470,7 +1529,7 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume)
                 int size, n;
 
                 size = ARRAY_SIZE(i2c_adc_init);
-                /* snd_printk("I2C:array size=0x%x\n", size); */
+                /* snd_printk(KERN_DEBUG "I2C:array size=0x%x\n", size); */
                 for (n = 0; n < size; n++)
                         snd_ca0106_i2c_write(chip, i2c_adc_init[n][0],
                                              i2c_adc_init[n][1]);
@@ -1707,9 +1766,9 @@ static int __devinit snd_ca0106_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         err = snd_ca0106_create(dev, card, pci, &chip);
         if (err < 0)
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 1a74ca62c314..c7899c32aba1 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -3272,9 +3272,9 @@ static int __devinit snd_cmipci_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
         
         switch (pci->device) {
         case PCI_DEVICE_ID_CMEDIA_CM8738:
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index 192e7842e181..f6286f84a221 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -834,7 +834,11 @@ static snd_pcm_uframes_t snd_cs4281_pointer(struct snd_pcm_substream *substream)
         struct cs4281_dma *dma = runtime->private_data;
         struct cs4281 *chip = snd_pcm_substream_chip(substream);
 
-        // printk("DCC = 0x%x, buffer_size = 0x%x, jiffies = %li\n", snd_cs4281_peekBA0(chip, dma->regDCC), runtime->buffer_size, jiffies);
+        /*
+        printk(KERN_DEBUG "DCC = 0x%x, buffer_size = 0x%x, jiffies = %li\n",
+               snd_cs4281_peekBA0(chip, dma->regDCC), runtime->buffer_size,
+               jiffies);
+        */
         return runtime->buffer_size -
                snd_cs4281_peekBA0(chip, dma->regDCC) - 1;
 }
@@ -1925,9 +1929,9 @@ static int __devinit snd_cs4281_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         if ((err = snd_cs4281_create(card, pci, &chip, dual_codec[dev])) < 0) {
                 snd_card_free(card);
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c
index e876b3263e46..c9b3e3d48cbc 100644
--- a/sound/pci/cs46xx/cs46xx.c
+++ b/sound/pci/cs46xx/cs46xx.c
@@ -88,9 +88,9 @@ static int __devinit snd_card_cs46xx_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
         if ((err = snd_cs46xx_create(card, pci,
                                      external_amp[dev], thinkpad[dev],
                                      &chip)) < 0) {
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 8ab07aa63652..1be96ead4244 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -194,7 +194,7 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip,
          *  ACSDA = Status Data Register = 474h
          */
 #if 0
-        printk("e) reg = 0x%x, val = 0x%x, BA0_ACCAD = 0x%x\n", reg,
+        printk(KERN_DEBUG "e) reg = 0x%x, val = 0x%x, BA0_ACCAD = 0x%x\n", reg,
                         snd_cs46xx_peekBA0(chip, BA0_ACSDA),
                         snd_cs46xx_peekBA0(chip, BA0_ACCAD));
 #endif
@@ -428,8 +428,8 @@ static int cs46xx_wait_for_fifo(struct snd_cs46xx * chip,int retry_timeout)
         }
   
         if(status & SERBST_WBSY) {
-                snd_printk( KERN_ERR "cs46xx: failure waiting for FIFO command to complete\n");
-
+                snd_printk(KERN_ERR "cs46xx: failure waiting for "
+                           "FIFO command to complete\n");
                 return -EINVAL;
         }
 
diff --git a/sound/pci/cs46xx/cs46xx_lib.h b/sound/pci/cs46xx/cs46xx_lib.h
index 018a7de56017..4eb55aa33612 100644
--- a/sound/pci/cs46xx/cs46xx_lib.h
+++ b/sound/pci/cs46xx/cs46xx_lib.h
@@ -62,7 +62,11 @@ static inline void snd_cs46xx_poke(struct snd_cs46xx *chip, unsigned long reg, u
         unsigned int bank = reg >> 16;
         unsigned int offset = reg & 0xffff;
 
-        /*if (bank == 0) printk("snd_cs46xx_poke: %04X - %08X\n",reg >> 2,val); */
+        /*
+        if (bank == 0)
+                printk(KERN_DEBUG "snd_cs46xx_poke: %04X - %08X\n",
+                       reg >> 2,val);
+        */
         writel(val, chip->region.idx[bank+1].remap_addr + offset);
 }
 
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index 6dea5b5cc774..dc464321d0f3 100644
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -258,10 +258,10 @@ static int __devinit snd_cs5530_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
 
-        if (card == NULL)
-                return -ENOMEM;
+        if (err < 0)
+                return err;
 
         err = snd_cs5530_create(card, pci, &chip);
         if (err < 0) {
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 826e6dec2e97..c89ed1f5bc2b 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -312,7 +312,7 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,
 
         if (request_irq(pci->irq, snd_cs5535audio_interrupt,
                         IRQF_SHARED, "CS5535 Audio", cs5535au)) {
-                snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 err = -EBUSY;
                 goto sndfail;
         }
@@ -353,9 +353,9 @@ static int __devinit snd_cs5535audio_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         if ((err = snd_cs5535audio_create(card, pci, &cs5535au)) < 0)
                 goto probefail_out;
diff --git a/sound/pci/echoaudio/Makefile b/sound/pci/echoaudio/Makefile
index 7b576aeb3f8d..1361de77e0cd 100644
--- a/sound/pci/echoaudio/Makefile
+++ b/sound/pci/echoaudio/Makefile
@@ -15,6 +15,8 @@ snd-echo3g-objs := echo3g.o
 snd-indigo-objs := indigo.o
 snd-indigoio-objs := indigoio.o
 snd-indigodj-objs := indigodj.o
+snd-indigoiox-objs := indigoiox.o
+snd-indigodjx-objs := indigodjx.o
 
 obj-$(CONFIG_SND_DARLA20) += snd-darla20.o
 obj-$(CONFIG_SND_GINA20) += snd-gina20.o
@@ -28,3 +30,5 @@ obj-$(CONFIG_SND_ECHO3G) += snd-echo3g.o
 obj-$(CONFIG_SND_INDIGO) += snd-indigo.o
 obj-$(CONFIG_SND_INDIGOIO) += snd-indigoio.o
 obj-$(CONFIG_SND_INDIGODJ) += snd-indigodj.o
+obj-$(CONFIG_SND_INDIGOIOX) += snd-indigoiox.o
+obj-$(CONFIG_SND_INDIGODJX) += snd-indigodjx.o
diff --git a/sound/pci/echoaudio/echo3g_dsp.c b/sound/pci/echoaudio/echo3g_dsp.c
index 417e25add82b..57967e580571 100644
--- a/sound/pci/echoaudio/echo3g_dsp.c
+++ b/sound/pci/echoaudio/echo3g_dsp.c
@@ -56,7 +56,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         }
 
         chip->comm_page->e3g_frq_register =
-                __constant_cpu_to_le32((E3G_MAGIC_NUMBER / 48000) - 2);
+                cpu_to_le32((E3G_MAGIC_NUMBER / 48000) - 2);
         chip->device_id = device_id;
         chip->subdevice_id = subdevice_id;
         chip->bad_board = TRUE;
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 8dbc5c4ba421..da2065cd2c0d 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -950,6 +950,8 @@ static int __devinit snd_echo_new_pcm(struct echoaudio *chip)
         Control interface
 ******************************************************************************/
 
+#ifndef ECHOCARD_HAS_VMIXER
+
 /******************* PCM output volume *******************/
 static int snd_echo_output_gain_info(struct snd_kcontrol *kcontrol,
                                      struct snd_ctl_elem_info *uinfo)
@@ -1001,18 +1003,6 @@ static int snd_echo_output_gain_put(struct snd_kcontrol *kcontrol,
         return changed;
 }
 
-#ifdef ECHOCARD_HAS_VMIXER
-/* On Vmixer cards this one controls the line-out volume */
-static struct snd_kcontrol_new snd_echo_line_output_gain __devinitdata = {
-        .name = "Line Playback Volume",
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-        .info = snd_echo_output_gain_info,
-        .get = snd_echo_output_gain_get,
-        .put = snd_echo_output_gain_put,
-        .tlv = {.p = db_scale_output_gain},
-};
-#else
 static struct snd_kcontrol_new snd_echo_pcm_output_gain __devinitdata = {
         .name = "PCM Playback Volume",
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1022,6 +1012,7 @@ static struct snd_kcontrol_new snd_echo_pcm_output_gain __devinitdata = {
         .put = snd_echo_output_gain_put,
         .tlv = {.p = db_scale_output_gain},
 };
+
 #endif
 
 
@@ -1997,9 +1988,9 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,
 
         DE_INIT(("Echoaudio driver starting...\n"));
         i = 0;
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         snd_card_set_dev(card, &pci->dev);
 
@@ -2037,8 +2028,6 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,
 
 #ifdef ECHOCARD_HAS_VMIXER
         snd_echo_vmixer.count = num_pipes_out(chip) * num_busses_out(chip);
-        if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_echo_line_output_gain, chip))) < 0)
-                goto ctl_error;
         if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_echo_vmixer, chip))) < 0)
                 goto ctl_error;
 #else
diff --git a/sound/pci/echoaudio/echoaudio.h b/sound/pci/echoaudio/echoaudio.h
index 1c88e051abf2..f9490ae36c2e 100644
--- a/sound/pci/echoaudio/echoaudio.h
+++ b/sound/pci/echoaudio/echoaudio.h
@@ -189,6 +189,9 @@
 #define INDIGO                  0x0090
 #define INDIGO_IO               0x00a0
 #define INDIGO_DJ               0x00b0
+#define DC8                     0x00c0
+#define INDIGO_IOX              0x00d0
+#define INDIGO_DJX              0x00e0
 #define ECHO3G                  0x0100
 
 
diff --git a/sound/pci/echoaudio/echoaudio_3g.c b/sound/pci/echoaudio/echoaudio_3g.c
index c3736bbd819e..e32a74897921 100644
--- a/sound/pci/echoaudio/echoaudio_3g.c
+++ b/sound/pci/echoaudio/echoaudio_3g.c
@@ -40,8 +40,7 @@ static int check_asic_status(struct echoaudio *chip)
         if (wait_handshake(chip))
                 return -EIO;
 
-        chip->comm_page->ext_box_status =
-                __constant_cpu_to_le32(E3G_ASIC_NOT_LOADED);
+        chip->comm_page->ext_box_status = cpu_to_le32(E3G_ASIC_NOT_LOADED);
         chip->asic_loaded = FALSE;
         clear_handshake(chip);
         send_vector(chip, DSP_VC_TEST_ASIC);
diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c
index be0e18192de3..4df51ef5e095 100644
--- a/sound/pci/echoaudio/echoaudio_dsp.c
+++ b/sound/pci/echoaudio/echoaudio_dsp.c
@@ -926,11 +926,11 @@ static int init_dsp_comm_page(struct echoaudio *chip)
 
         /* Init the comm page */
         chip->comm_page->comm_size =
-                __constant_cpu_to_le32(sizeof(struct comm_page));
+                cpu_to_le32(sizeof(struct comm_page));
         chip->comm_page->handshake = 0xffffffff;
         chip->comm_page->midi_out_free_count =
-                __constant_cpu_to_le32(DSP_MIDI_OUT_FIFO_SIZE);
-        chip->comm_page->sample_rate = __constant_cpu_to_le32(44100);
+                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 */
diff --git a/sound/pci/echoaudio/echoaudio_dsp.h b/sound/pci/echoaudio/echoaudio_dsp.h
index e352f3ae292c..cb7d75a0a503 100644
--- a/sound/pci/echoaudio/echoaudio_dsp.h
+++ b/sound/pci/echoaudio/echoaudio_dsp.h
@@ -576,8 +576,13 @@ SET_LAYLA24_FREQUENCY_REG command.
 #define E3G_ASIC_NOT_LOADED             0xffff
 #define E3G_BOX_TYPE_MASK               0xf0
 
-#define EXT_3GBOX_NC                    0x01
-#define EXT_3GBOX_NOT_SET               0x02
+/* Indigo express control register values */
+#define INDIGO_EXPRESS_32000            0x02
+#define INDIGO_EXPRESS_44100            0x01
+#define INDIGO_EXPRESS_48000            0x00
+#define INDIGO_EXPRESS_DOUBLE_SPEED     0x10
+#define INDIGO_EXPRESS_QUAD_SPEED       0x04
+#define INDIGO_EXPRESS_CLOCK_MASK       0x17
 
 
 /*
diff --git a/sound/pci/echoaudio/gina20_dsp.c b/sound/pci/echoaudio/gina20_dsp.c
index db6c952e9d7f..3f1e7475faea 100644
--- a/sound/pci/echoaudio/gina20_dsp.c
+++ b/sound/pci/echoaudio/gina20_dsp.c
@@ -208,10 +208,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)
         DE_ACT(("set_professional_spdif %d\n", prof));
         if (prof)
                 chip->comm_page->flags |=
-                        __constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
+                        cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
         else
                 chip->comm_page->flags &=
-                        ~__constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
+                        ~cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
         chip->professional_spdif = prof;
         return update_flags(chip);
 }
diff --git a/sound/pci/echoaudio/indigo_dsp.c b/sound/pci/echoaudio/indigo_dsp.c
index f05e39f7aad9..0b2cd9c86277 100644
--- a/sound/pci/echoaudio/indigo_dsp.c
+++ b/sound/pci/echoaudio/indigo_dsp.c
@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         if ((err = init_line_levels(chip)) < 0)
                 return err;
 
-        /* Default routing of the virtual channels: all vchannels are routed
-        to the stereo output */
-        set_vmixer_gain(chip, 0, 0, 0);
-        set_vmixer_gain(chip, 1, 1, 0);
-        set_vmixer_gain(chip, 0, 2, 0);
-        set_vmixer_gain(chip, 1, 3, 0);
-        set_vmixer_gain(chip, 0, 4, 0);
-        set_vmixer_gain(chip, 1, 5, 0);
-        set_vmixer_gain(chip, 0, 6, 0);
-        set_vmixer_gain(chip, 1, 7, 0);
-        err = update_vmixer_level(chip);
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
diff --git a/sound/pci/echoaudio/indigo_express_dsp.c b/sound/pci/echoaudio/indigo_express_dsp.c
new file mode 100644
index 000000000000..9ab625e15652
--- /dev/null
+++ b/sound/pci/echoaudio/indigo_express_dsp.c
@@ -0,0 +1,119 @@
+/************************************************************************
+
+This file is part of Echo Digital Audio's generic driver library.
+Copyright Echo Digital Audio Corporation (c) 1998 - 2005
+All rights reserved
+www.echoaudio.com
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*************************************************************************
+
+ Translation from C++ and adaptation for use in ALSA-Driver
+ were made by Giuliano Pochini <pochini@shiny.it>
+
+*************************************************************************/
+
+static int set_sample_rate(struct echoaudio *chip, u32 rate)
+{
+        u32 clock, control_reg, old_control_reg;
+
+        if (wait_handshake(chip))
+                return -EIO;
+
+        old_control_reg = le32_to_cpu(chip->comm_page->control_register);
+        control_reg = old_control_reg & ~INDIGO_EXPRESS_CLOCK_MASK;
+
+        switch (rate) {
+        case 32000:
+                clock = INDIGO_EXPRESS_32000;
+                break;
+        case 44100:
+                clock = INDIGO_EXPRESS_44100;
+                break;
+        case 48000:
+                clock = INDIGO_EXPRESS_48000;
+                break;
+        case 64000:
+                clock = INDIGO_EXPRESS_32000|INDIGO_EXPRESS_DOUBLE_SPEED;
+                break;
+        case 88200:
+                clock = INDIGO_EXPRESS_44100|INDIGO_EXPRESS_DOUBLE_SPEED;
+                break;
+        case 96000:
+                clock = INDIGO_EXPRESS_48000|INDIGO_EXPRESS_DOUBLE_SPEED;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        control_reg |= clock;
+        if (control_reg != old_control_reg) {
+                chip->comm_page->control_register = cpu_to_le32(control_reg);
+                chip->sample_rate = rate;
+                clear_handshake(chip);
+                return send_vector(chip, DSP_VC_UPDATE_CLOCKS);
+        }
+        return 0;
+}
+
+
+
+/* This function routes the sound from a virtual channel to a real output */
+static int set_vmixer_gain(struct echoaudio *chip, u16 output, u16 pipe,
+                           int gain)
+{
+        int index;
+
+        if (snd_BUG_ON(pipe >= num_pipes_out(chip) ||
+                       output >= num_busses_out(chip)))
+                return -EINVAL;
+
+        if (wait_handshake(chip))
+                return -EIO;
+
+        chip->vmixer_gain[output][pipe] = gain;
+        index = output * num_pipes_out(chip) + pipe;
+        chip->comm_page->vmixer[index] = gain;
+
+        DE_ACT(("set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain));
+        return 0;
+}
+
+
+
+/* Tell the DSP to read and update virtual mixer levels in comm page. */
+static int update_vmixer_level(struct echoaudio *chip)
+{
+        if (wait_handshake(chip))
+                return -EIO;
+        clear_handshake(chip);
+        return send_vector(chip, DSP_VC_SET_VMIXER_GAIN);
+}
+
+
+
+static u32 detect_input_clocks(const struct echoaudio *chip)
+{
+        return ECHO_CLOCK_BIT_INTERNAL;
+}
+
+
+
+/* The IndigoIO has no ASIC. Just do nothing */
+static int load_asic(struct echoaudio *chip)
+{
+        return 0;
+}
diff --git a/sound/pci/echoaudio/indigodj_dsp.c b/sound/pci/echoaudio/indigodj_dsp.c
index 90730a5ecb42..08392916691e 100644
--- a/sound/pci/echoaudio/indigodj_dsp.c
+++ b/sound/pci/echoaudio/indigodj_dsp.c
@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         if ((err = init_line_levels(chip)) < 0)
                 return err;
 
-        /* Default routing of the virtual channels: vchannels 0-3 and
-        vchannels 4-7 are routed to real channels 0-4 */
-        set_vmixer_gain(chip, 0, 0, 0);
-        set_vmixer_gain(chip, 1, 1, 0);
-        set_vmixer_gain(chip, 2, 2, 0);
-        set_vmixer_gain(chip, 3, 3, 0);
-        set_vmixer_gain(chip, 0, 4, 0);
-        set_vmixer_gain(chip, 1, 5, 0);
-        set_vmixer_gain(chip, 2, 6, 0);
-        set_vmixer_gain(chip, 3, 7, 0);
-        err = update_vmixer_level(chip);
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
diff --git a/sound/pci/echoaudio/indigodjx.c b/sound/pci/echoaudio/indigodjx.c
new file mode 100644
index 000000000000..3482ef69f491
--- /dev/null
+++ b/sound/pci/echoaudio/indigodjx.c
@@ -0,0 +1,107 @@
+/*
+ *  ALSA driver for Echoaudio soundcards.
+ *  Copyright (C) 2009 Giuliano Pochini <pochini@shiny.it>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  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.
+ */
+
+#define INDIGO_FAMILY
+#define ECHOCARD_INDIGO_DJX
+#define ECHOCARD_NAME "Indigo DJx"
+#define ECHOCARD_HAS_SUPER_INTERLEAVE
+#define ECHOCARD_HAS_VMIXER
+#define ECHOCARD_HAS_STEREO_BIG_ENDIAN32
+
+/* Pipe indexes */
+#define PX_ANALOG_OUT   0       /* 8 */
+#define PX_DIGITAL_OUT  8       /* 0 */
+#define PX_ANALOG_IN    8       /* 0 */
+#define PX_DIGITAL_IN   8       /* 0 */
+#define PX_NUM          8
+
+/* Bus indexes */
+#define BX_ANALOG_OUT   0       /* 4 */
+#define BX_DIGITAL_OUT  4       /* 0 */
+#define BX_ANALOG_IN    4       /* 0 */
+#define BX_DIGITAL_IN   4       /* 0 */
+#define BX_NUM          4
+
+
+#include <linux/delay.h>
+#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 <sound/core.h>
+#include <sound/info.h>
+#include <sound/control.h>
+#include <sound/tlv.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/asoundef.h>
+#include <sound/initval.h>
+#include <asm/atomic.h>
+#include "echoaudio.h"
+
+MODULE_FIRMWARE("ea/loader_dsp.fw");
+MODULE_FIRMWARE("ea/indigo_djx_dsp.fw");
+
+#define FW_361_LOADER           0
+#define FW_INDIGO_DJX_DSP       1
+
+static const struct firmware card_fw[] = {
+        {0, "loader_dsp.fw"},
+        {0, "indigo_djx_dsp.fw"}
+};
+
+static struct pci_device_id snd_echo_ids[] = {
+        {0x1057, 0x3410, 0xECC0, 0x00E0, 0, 0, 0},      /* Indigo DJx*/
+        {0,}
+};
+
+static struct snd_pcm_hardware pcm_hardware_skel = {
+        .info = SNDRV_PCM_INFO_MMAP |
+                SNDRV_PCM_INFO_INTERLEAVED |
+                SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                SNDRV_PCM_INFO_MMAP_VALID |
+                SNDRV_PCM_INFO_PAUSE |
+                SNDRV_PCM_INFO_SYNC_START,
+        .formats =      SNDRV_PCM_FMTBIT_U8 |
+                        SNDRV_PCM_FMTBIT_S16_LE |
+                        SNDRV_PCM_FMTBIT_S24_3LE |
+                        SNDRV_PCM_FMTBIT_S32_LE |
+                        SNDRV_PCM_FMTBIT_S32_BE,
+        .rates =        SNDRV_PCM_RATE_32000 |
+                        SNDRV_PCM_RATE_44100 |
+                        SNDRV_PCM_RATE_48000 |
+                        SNDRV_PCM_RATE_88200 |
+                        SNDRV_PCM_RATE_96000,
+        .rate_min = 32000,
+        .rate_max = 96000,
+        .channels_min = 1,
+        .channels_max = 4,
+        .buffer_bytes_max = 262144,
+        .period_bytes_min = 32,
+        .period_bytes_max = 131072,
+        .periods_min = 2,
+        .periods_max = 220,
+};
+
+#include "indigodjx_dsp.c"
+#include "indigo_express_dsp.c"
+#include "echoaudio_dsp.c"
+#include "echoaudio.c"
diff --git a/sound/pci/echoaudio/indigodjx_dsp.c b/sound/pci/echoaudio/indigodjx_dsp.c
new file mode 100644
index 000000000000..f591fc2ed960
--- /dev/null
+++ b/sound/pci/echoaudio/indigodjx_dsp.c
@@ -0,0 +1,68 @@
+/************************************************************************
+
+This file is part of Echo Digital Audio's generic driver library.
+Copyright Echo Digital Audio Corporation (c) 1998 - 2005
+All rights reserved
+www.echoaudio.com
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*************************************************************************
+
+ Translation from C++ and adaptation for use in ALSA-Driver
+ were made by Giuliano Pochini <pochini@shiny.it>
+
+*************************************************************************/
+
+static int update_vmixer_level(struct echoaudio *chip);
+static int set_vmixer_gain(struct echoaudio *chip, u16 output,
+                           u16 pipe, int gain);
+
+
+static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
+{
+        int err;
+
+        DE_INIT(("init_hw() - Indigo DJx\n"));
+        if (snd_BUG_ON((subdevice_id & 0xfff0) != INDIGO_DJX))
+                return -ENODEV;
+
+        err = init_dsp_comm_page(chip);
+        if (err < 0) {
+                DE_INIT(("init_hw - could not initialize DSP comm page\n"));
+                return err;
+        }
+
+        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];
+        /* Since this card has no ASIC, mark it as loaded so everything
+           works OK */
+        chip->asic_loaded = TRUE;
+        chip->input_clock_types = ECHO_CLOCK_BIT_INTERNAL;
+
+        err = load_firmware(chip);
+        if (err < 0)
+                return err;
+        chip->bad_board = FALSE;
+
+        err = init_line_levels(chip);
+        if (err < 0)
+                return err;
+
+        DE_INIT(("init_hw done\n"));
+        return err;
+}
diff --git a/sound/pci/echoaudio/indigoio_dsp.c b/sound/pci/echoaudio/indigoio_dsp.c
index a7e09ec21079..0604c8a85223 100644
--- a/sound/pci/echoaudio/indigoio_dsp.c
+++ b/sound/pci/echoaudio/indigoio_dsp.c
@@ -63,18 +63,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         if ((err = init_line_levels(chip)) < 0)
                 return err;
 
-        /* Default routing of the virtual channels: all vchannels are routed
-        to the stereo output */
-        set_vmixer_gain(chip, 0, 0, 0);
-        set_vmixer_gain(chip, 1, 1, 0);
-        set_vmixer_gain(chip, 0, 2, 0);
-        set_vmixer_gain(chip, 1, 3, 0);
-        set_vmixer_gain(chip, 0, 4, 0);
-        set_vmixer_gain(chip, 1, 5, 0);
-        set_vmixer_gain(chip, 0, 6, 0);
-        set_vmixer_gain(chip, 1, 7, 0);
-        err = update_vmixer_level(chip);
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
diff --git a/sound/pci/echoaudio/indigoiox.c b/sound/pci/echoaudio/indigoiox.c
new file mode 100644
index 000000000000..aebee27a40ff
--- /dev/null
+++ b/sound/pci/echoaudio/indigoiox.c
@@ -0,0 +1,109 @@
+/*
+ *  ALSA driver for Echoaudio soundcards.
+ *  Copyright (C) 2009 Giuliano Pochini <pochini@shiny.it>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  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.
+ */
+
+#define INDIGO_FAMILY
+#define ECHOCARD_INDIGO_IOX
+#define ECHOCARD_NAME "Indigo IOx"
+#define ECHOCARD_HAS_MONITOR
+#define ECHOCARD_HAS_SUPER_INTERLEAVE
+#define ECHOCARD_HAS_VMIXER
+#define ECHOCARD_HAS_STEREO_BIG_ENDIAN32
+
+/* Pipe indexes */
+#define PX_ANALOG_OUT   0       /* 8 */
+#define PX_DIGITAL_OUT  8       /* 0 */
+#define PX_ANALOG_IN    8       /* 2 */
+#define PX_DIGITAL_IN   10      /* 0 */
+#define PX_NUM          10
+
+/* Bus indexes */
+#define BX_ANALOG_OUT   0       /* 2 */
+#define BX_DIGITAL_OUT  2       /* 0 */
+#define BX_ANALOG_IN    2       /* 2 */
+#define BX_DIGITAL_IN   4       /* 0 */
+#define BX_NUM          4
+
+
+#include <linux/delay.h>
+#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 <sound/core.h>
+#include <sound/info.h>
+#include <sound/control.h>
+#include <sound/tlv.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/asoundef.h>
+#include <sound/initval.h>
+#include <asm/atomic.h>
+#include "echoaudio.h"
+
+MODULE_FIRMWARE("ea/loader_dsp.fw");
+MODULE_FIRMWARE("ea/indigo_iox_dsp.fw");
+
+#define FW_361_LOADER           0
+#define FW_INDIGO_IOX_DSP       1
+
+static const struct firmware card_fw[] = {
+        {0, "loader_dsp.fw"},
+        {0, "indigo_iox_dsp.fw"}
+};
+
+static struct pci_device_id snd_echo_ids[] = {
+        {0x1057, 0x3410, 0xECC0, 0x00D0, 0, 0, 0},      /* Indigo IOx */
+        {0,}
+};
+
+static struct snd_pcm_hardware pcm_hardware_skel = {
+        .info = SNDRV_PCM_INFO_MMAP |
+                SNDRV_PCM_INFO_INTERLEAVED |
+                SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                SNDRV_PCM_INFO_MMAP_VALID |
+                SNDRV_PCM_INFO_PAUSE |
+                SNDRV_PCM_INFO_SYNC_START,
+        .formats =      SNDRV_PCM_FMTBIT_U8 |
+                        SNDRV_PCM_FMTBIT_S16_LE |
+                        SNDRV_PCM_FMTBIT_S24_3LE |
+                        SNDRV_PCM_FMTBIT_S32_LE |
+                        SNDRV_PCM_FMTBIT_S32_BE,
+        .rates =        SNDRV_PCM_RATE_32000 |
+                        SNDRV_PCM_RATE_44100 |
+                        SNDRV_PCM_RATE_48000 |
+                        SNDRV_PCM_RATE_88200 |
+                        SNDRV_PCM_RATE_96000,
+        .rate_min = 32000,
+        .rate_max = 96000,
+        .channels_min = 1,
+        .channels_max = 8,
+        .buffer_bytes_max = 262144,
+        .period_bytes_min = 32,
+        .period_bytes_max = 131072,
+        .periods_min = 2,
+        .periods_max = 220,
+};
+
+#include "indigoiox_dsp.c"
+#include "indigo_express_dsp.c"
+#include "echoaudio_dsp.c"
+#include "echoaudio.c"
+
diff --git a/sound/pci/echoaudio/indigoiox_dsp.c b/sound/pci/echoaudio/indigoiox_dsp.c
new file mode 100644
index 000000000000..f357521c79e6
--- /dev/null
+++ b/sound/pci/echoaudio/indigoiox_dsp.c
@@ -0,0 +1,68 @@
+/************************************************************************
+
+This file is part of Echo Digital Audio's generic driver library.
+Copyright Echo Digital Audio Corporation (c) 1998 - 2005
+All rights reserved
+www.echoaudio.com
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*************************************************************************
+
+ Translation from C++ and adaptation for use in ALSA-Driver
+ were made by Giuliano Pochini <pochini@shiny.it>
+
+*************************************************************************/
+
+static int update_vmixer_level(struct echoaudio *chip);
+static int set_vmixer_gain(struct echoaudio *chip, u16 output,
+                           u16 pipe, int gain);
+
+
+static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
+{
+        int err;
+
+        DE_INIT(("init_hw() - Indigo IOx\n"));
+        if (snd_BUG_ON((subdevice_id & 0xfff0) != INDIGO_IOX))
+                return -ENODEV;
+
+        err = init_dsp_comm_page(chip);
+        if (err < 0) {
+                DE_INIT(("init_hw - could not initialize DSP comm page\n"));
+                return err;
+        }
+
+        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];
+        /* Since this card has no ASIC, mark it as loaded so everything
+           works OK */
+        chip->asic_loaded = TRUE;
+        chip->input_clock_types = ECHO_CLOCK_BIT_INTERNAL;
+
+        err = load_firmware(chip);
+        if (err < 0)
+                return err;
+        chip->bad_board = FALSE;
+
+        err = init_line_levels(chip);
+        if (err < 0)
+                return err;
+
+        DE_INIT(("init_hw done\n"));
+        return err;
+}
diff --git a/sound/pci/echoaudio/layla20_dsp.c b/sound/pci/echoaudio/layla20_dsp.c
index ede75c6ca0fb..83750e9fd7b4 100644
--- a/sound/pci/echoaudio/layla20_dsp.c
+++ b/sound/pci/echoaudio/layla20_dsp.c
@@ -284,10 +284,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)
         DE_ACT(("set_professional_spdif %d\n", prof));
         if (prof)
                 chip->comm_page->flags |=
-                        __constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
+                        cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
         else
                 chip->comm_page->flags &=
-                        ~__constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
+                        ~cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
         chip->professional_spdif = prof;
         return update_flags(chip);
 }
diff --git a/sound/pci/echoaudio/mia_dsp.c b/sound/pci/echoaudio/mia_dsp.c
index 227386602f9b..551405114cbc 100644
--- a/sound/pci/echoaudio/mia_dsp.c
+++ b/sound/pci/echoaudio/mia_dsp.c
@@ -69,18 +69,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)
         if ((err = init_line_levels(chip)))
                 return err;
 
-        /* Default routing of the virtual channels: vchannels 0-3 go to analog
-        outputs and vchannels 4-7 go to S/PDIF outputs */
-        set_vmixer_gain(chip, 0, 0, 0);
-        set_vmixer_gain(chip, 1, 1, 0);
-        set_vmixer_gain(chip, 0, 2, 0);
-        set_vmixer_gain(chip, 1, 3, 0);
-        set_vmixer_gain(chip, 2, 4, 0);
-        set_vmixer_gain(chip, 3, 5, 0);
-        set_vmixer_gain(chip, 2, 6, 0);
-        set_vmixer_gain(chip, 3, 7, 0);
-        err = update_vmixer_level(chip);
-
         DE_INIT(("init_hw done\n"));
         return err;
 }
@@ -222,10 +210,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)
         DE_ACT(("set_professional_spdif %d\n", prof));
         if (prof)
                 chip->comm_page->flags |=
-                        __constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
+                        cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
         else
                 chip->comm_page->flags &=
-                        ~__constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
+                        ~cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);
         chip->professional_spdif = prof;
         return update_flags(chip);
 }
diff --git a/sound/pci/echoaudio/midi.c b/sound/pci/echoaudio/midi.c
index 77bf2a83d997..a953d142cb4b 100644
--- a/sound/pci/echoaudio/midi.c
+++ b/sound/pci/echoaudio/midi.c
@@ -44,10 +44,10 @@ static int enable_midi_input(struct echoaudio *chip, char enable)
         if (enable) {
                 chip->mtc_state = MIDI_IN_STATE_NORMAL;
                 chip->comm_page->flags |=
-                        __constant_cpu_to_le32(DSP_FLAG_MIDI_INPUT);
+                        cpu_to_le32(DSP_FLAG_MIDI_INPUT);
         } else
                 chip->comm_page->flags &=
-                        ~__constant_cpu_to_le32(DSP_FLAG_MIDI_INPUT);
+                        ~cpu_to_le32(DSP_FLAG_MIDI_INPUT);
 
         clear_handshake(chip);
         return send_vector(chip, DSP_VC_UPDATE_FLAGS);
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 8354c1a83312..c7f3b994101c 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -114,9 +114,9 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
         if (max_buffer_size[dev] < 32)
                 max_buffer_size[dev] = 32;
         else if (max_buffer_size[dev] > 1024)
diff --git a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c
index 0e649dcdbf64..7ef949d99a50 100644
--- a/sound/pci/emu10k1/emu10k1_callback.c
+++ b/sound/pci/emu10k1/emu10k1_callback.c
@@ -103,7 +103,10 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)
                         int ch;
                         vp = &emu->voices[best[i].voice];
                         if ((ch = vp->ch) < 0) {
-                                //printk("synth_get_voice: ch < 0 (%d) ??", i);
+                                /*
+                                printk(KERN_WARNING
+                                       "synth_get_voice: ch < 0 (%d) ??", i);
+                                */
                                 continue;
                         }
                         vp->emu->num_voices--;
@@ -335,7 +338,7 @@ start_voice(struct snd_emux_voice *vp)
                 return -EINVAL;
         emem->map_locked++;
         if (snd_emu10k1_memblk_map(hw, emem) < 0) {
-                // printk("emu: cannot map!\n");
+                /* printk(KERN_ERR "emu: cannot map!\n"); */
                 return -ENOMEM;
         }
         mapped_offset = snd_emu10k1_memblk_offset(emem) >> 1;
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 101a1c13a20d..f18bd6207c50 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -711,8 +711,7 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu, const char *filena
 static int emu1010_firmware_thread(void *data)
 {
         struct snd_emu10k1 *emu = data;
-        int tmp, tmp2;
-        int reg;
+        u32 tmp, tmp2, reg;
         int err;
 
         for (;;) {
@@ -758,7 +757,8 @@ static int emu1010_firmware_thread(void *data)
                         snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
                         snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
                         snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
-                        snd_printk("Audio Dock ver:%d.%d\n", tmp, tmp2);
+                        snd_printk(KERN_INFO "Audio Dock ver: %u.%u\n",
+                                   tmp, tmp2);
                         /* Sync clocking between 1010 and Dock */
                         /* Allow DLL to settle */
                         msleep(10);
@@ -804,8 +804,7 @@ static int emu1010_firmware_thread(void *data)
 static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
 {
         unsigned int i;
-        int tmp, tmp2;
-        int reg;
+        u32 tmp, tmp2, reg;
         int err;
         const char *filename = NULL;
 
@@ -887,7 +886,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
         snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
         snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);
         snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);
-        snd_printk("emu1010: Hana version: %d.%d\n", tmp, tmp2);
+        snd_printk(KERN_INFO "emu1010: Hana version: %u.%u\n", tmp, tmp2);
         /* Enable 48Volt power to Audio Dock */
         snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);
 
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 5ff4dbb62dad..31542adc6b7e 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -1544,9 +1544,9 @@ static int __devinit snd_emu10k1x_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         if ((err = snd_emu10k1x_create(card, pci, &chip)) < 0) {
                 snd_card_free(card);
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 7dba08f0ab8e..191e1cd9997d 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -1519,7 +1519,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
         /* A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS); */
         if (emu->card_capabilities->emu_model) {
                 /* EMU1010 Outputs from PCM Front, Rear, Center, LFE, Side */
-                snd_printk("EMU outputs on\n");
+                snd_printk(KERN_INFO "EMU outputs on\n");
                 for (z = 0; z < 8; z++) {
                         if (emu->card_capabilities->ca0108_chip) {
                                 A_OP(icode, &ptr, iACC3, A3_EMU32OUT(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);
@@ -1567,7 +1567,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
 
         if (emu->card_capabilities->emu_model) {
                 if (emu->card_capabilities->ca0108_chip) {
-                        snd_printk("EMU2 inputs on\n");
+                        snd_printk(KERN_INFO "EMU2 inputs on\n");
                         for (z = 0; z < 0x10; z++) {
                                 snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, 
                                                                         bit_shifter16,
@@ -1575,10 +1575,13 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
                                                                         A_FXBUS2(z*2) );
                         }
                 } else {
-                        snd_printk("EMU inputs on\n");
+                        snd_printk(KERN_INFO "EMU inputs on\n");
                         /* Capture 16 (originally 8) channels of S32_LE sound */
 
-                        /* printk("emufx.c: gpr=0x%x, tmp=0x%x\n",gpr, tmp); */
+                        /*
+                        printk(KERN_DEBUG "emufx.c: gpr=0x%x, tmp=0x%x\n",
+                               gpr, tmp);
+                        */
                         /* For the EMU1010: How to get 32bit values from the DSP. High 16bits into L, low 16bits into R. */
                         /* A_P16VIN(0) is delayed by one sample,
                          * so all other A_P16VIN channels will need to also be delayed
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index cf9276ddad42..78f62fd404c2 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -44,7 +44,7 @@ static void snd_emu10k1_pcm_interrupt(struct snd_emu10k1 *emu,
         if (epcm->substream == NULL)
                 return;
 #if 0
-        printk("IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",
+        printk(KERN_DEBUG "IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",
                         epcm->substream->runtime->hw->pointer(emu, epcm->substream),
                         snd_pcm_lib_period_bytes(epcm->substream),
                         snd_pcm_lib_buffer_bytes(epcm->substream));
@@ -146,7 +146,11 @@ static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm * epcm, int voic
                                               1,
                                               &epcm->extra);
                 if (err < 0) {
-                        /* printk("pcm_channel_alloc: failed extra: voices=%d, frame=%d\n", voices, frame); */
+                        /*
+                        printk(KERN_DEBUG "pcm_channel_alloc: "
+                               "failed extra: voices=%d, frame=%d\n",
+                               voices, frame);
+                        */
                         for (i = 0; i < voices; i++) {
                                 snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]);
                                 epcm->voices[i] = NULL;
@@ -737,7 +741,10 @@ static int snd_emu10k1_playback_trigger(struct snd_pcm_substream *substream,
         struct snd_emu10k1_pcm_mixer *mix;
         int result = 0;
 
-        /* printk("trigger - emu10k1 = 0x%x, cmd = %i, pointer = %i\n", (int)emu, cmd, substream->ops->pointer(substream)); */
+        /*
+        printk(KERN_DEBUG "trigger - emu10k1 = 0x%x, cmd = %i, pointer = %i\n",
+               (int)emu, cmd, substream->ops->pointer(substream))
+        */
         spin_lock(&emu->reg_lock);
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
@@ -786,7 +793,10 @@ static int snd_emu10k1_capture_trigger(struct snd_pcm_substream *substream,
                 /* hmm this should cause full and half full interrupt to be raised? */
                 outl(epcm->capture_ipr, emu->port + IPR);
                 snd_emu10k1_intr_enable(emu, epcm->capture_inte);
-                /* printk("adccr = 0x%x, adcbs = 0x%x\n", epcm->adccr, epcm->adcbs); */
+                /*
+                printk(KERN_DEBUG "adccr = 0x%x, adcbs = 0x%x\n",
+                       epcm->adccr, epcm->adcbs);
+                */
                 switch (epcm->type) {
                 case CAPTURE_AC97ADC:
                         snd_emu10k1_ptr_write(emu, ADCCR, 0, epcm->capture_cr_val);
@@ -857,7 +867,11 @@ static snd_pcm_uframes_t snd_emu10k1_playback_pointer(struct snd_pcm_substream *
                         ptr -= runtime->buffer_size;
         }
 #endif
-        /* printk("ptr = 0x%x, buffer_size = 0x%x, period_size = 0x%x\n", ptr, runtime->buffer_size, runtime->period_size); */
+        /*
+        printk(KERN_DEBUG
+               "ptr = 0x%x, buffer_size = 0x%x, period_size = 0x%x\n",
+               ptr, runtime->buffer_size, runtime->period_size);
+        */
         return ptr;
 }
 
@@ -1546,7 +1560,11 @@ static void snd_emu10k1_fx8010_playback_tram_poke1(unsigned short *dst_left,
                                                    unsigned int count,
                                                    unsigned int tram_shift)
 {
-        /* printk("tram_poke1: dst_left = 0x%p, dst_right = 0x%p, src = 0x%p, count = 0x%x\n", dst_left, dst_right, src, count); */
+        /*
+        printk(KERN_DEBUG "tram_poke1: dst_left = 0x%p, dst_right = 0x%p, "
+               "src = 0x%p, count = 0x%x\n",
+               dst_left, dst_right, src, count);
+        */
         if ((tram_shift & 1) == 0) {
                 while (count--) {
                         *dst_left-- = *src++;
@@ -1623,7 +1641,12 @@ static int snd_emu10k1_fx8010_playback_prepare(struct snd_pcm_substream *substre
         struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
         unsigned int i;
         
-        /* printk("prepare: etram_pages = 0x%p, dma_area = 0x%x, buffer_size = 0x%x (0x%x)\n", emu->fx8010.etram_pages, runtime->dma_area, runtime->buffer_size, runtime->buffer_size << 2); */
+        /*
+        printk(KERN_DEBUG "prepare: etram_pages = 0x%p, dma_area = 0x%x, "
+               "buffer_size = 0x%x (0x%x)\n",
+               emu->fx8010.etram_pages, runtime->dma_area,
+               runtime->buffer_size, runtime->buffer_size << 2);
+        */
         memset(&pcm->pcm_rec, 0, sizeof(pcm->pcm_rec));
         pcm->pcm_rec.hw_buffer_size = pcm->buffer_size * 2; /* byte size */
         pcm->pcm_rec.sw_buffer_size = snd_pcm_lib_buffer_bytes(substream);
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
index b5a802bdeb7c..4bfc31d1b281 100644
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
@@ -226,7 +226,9 @@ int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu,
                                 break;
 
                         if (timeout > 1000) {
-                                snd_printk("emu10k1:I2C:timeout status=0x%x\n", status);
+                                snd_printk(KERN_WARNING
+                                           "emu10k1:I2C:timeout status=0x%x\n",
+                                           status);
                                 break;
                         }
                 }
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index 749a21b6bd06..e617acaf10e3 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -168,7 +168,7 @@ static void snd_p16v_pcm_free_substream(struct snd_pcm_runtime *runtime)
         struct snd_emu10k1_pcm *epcm = runtime->private_data;
   
         if (epcm) {
-                //snd_printk("epcm free: %p\n", epcm);
+                /* snd_printk(KERN_DEBUG "epcm free: %p\n", epcm); */
                 kfree(epcm);
         }
 }
@@ -183,14 +183,16 @@ static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substrea
         int err;
 
         epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
-        //snd_printk("epcm kcalloc: %p\n", epcm);
+        /* snd_printk(KERN_DEBUG "epcm kcalloc: %p\n", epcm); */
 
         if (epcm == NULL)
                 return -ENOMEM;
         epcm->emu = emu;
         epcm->substream = substream;
-        //snd_printk("epcm device=%d, channel_id=%d\n", substream->pcm->device, channel_id);
-  
+        /*
+        snd_printk(KERN_DEBUG "epcm device=%d, channel_id=%d\n",
+                   substream->pcm->device, channel_id);
+        */
         runtime->private_data = epcm;
         runtime->private_free = snd_p16v_pcm_free_substream;
   
@@ -200,10 +202,15 @@ static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substrea
         channel->number = channel_id;
 
         channel->use=1;
-        //snd_printk("p16v: open channel_id=%d, channel=%p, use=0x%x\n", channel_id, channel, channel->use);
-        //printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, channel);
-        //channel->interrupt = snd_p16v_pcm_channel_interrupt;
-        channel->epcm=epcm;
+#if 0 /* debug */
+        snd_printk(KERN_DEBUG
+                   "p16v: open channel_id=%d, channel=%p, use=0x%x\n",
+                   channel_id, channel, channel->use);
+        printk(KERN_DEBUG "open:channel_id=%d, chip=%p, channel=%p\n",
+               channel_id, chip, channel);
+#endif /* debug */
+        /* channel->interrupt = snd_p16v_pcm_channel_interrupt; */
+        channel->epcm = epcm;
         if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
                 return err;
 
@@ -224,14 +231,16 @@ static int snd_p16v_pcm_open_capture_channel(struct snd_pcm_substream *substream
         int err;
 
         epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
-        //snd_printk("epcm kcalloc: %p\n", epcm);
+        /* snd_printk(KERN_DEBUG "epcm kcalloc: %p\n", epcm); */
 
         if (epcm == NULL)
                 return -ENOMEM;
         epcm->emu = emu;
         epcm->substream = substream;
-        //snd_printk("epcm device=%d, channel_id=%d\n", substream->pcm->device, channel_id);
-
+        /*
+        snd_printk(KERN_DEBUG "epcm device=%d, channel_id=%d\n",
+                   substream->pcm->device, channel_id);
+        */
         runtime->private_data = epcm;
         runtime->private_free = snd_p16v_pcm_free_substream;
   
@@ -241,10 +250,15 @@ static int snd_p16v_pcm_open_capture_channel(struct snd_pcm_substream *substream
         channel->number = channel_id;
 
         channel->use=1;
-        //snd_printk("p16v: open channel_id=%d, channel=%p, use=0x%x\n", channel_id, channel, channel->use);
-        //printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, channel);
-        //channel->interrupt = snd_p16v_pcm_channel_interrupt;
-        channel->epcm=epcm;
+#if 0 /* debug */
+        snd_printk(KERN_DEBUG
+                   "p16v: open channel_id=%d, channel=%p, use=0x%x\n",
+                   channel_id, channel, channel->use);
+        printk(KERN_DEBUG "open:channel_id=%d, chip=%p, channel=%p\n",
+               channel_id, chip, channel);
+#endif /* debug */
+        /* channel->interrupt = snd_p16v_pcm_channel_interrupt; */
+        channel->epcm = epcm;
         if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
                 return err;
 
@@ -334,9 +348,19 @@ static int snd_p16v_pcm_prepare_playback(struct snd_pcm_substream *substream)
         int i;
         u32 tmp;
         
-        //snd_printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, periods=%u, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size, runtime->periods, frames_to_bytes(runtime, 1));
-        //snd_printk("dma_addr=%x, dma_area=%p, table_base=%p\n",runtime->dma_addr, runtime->dma_area, table_base);
-        //snd_printk("dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",emu->p16v_buffer.addr, emu->p16v_buffer.area, emu->p16v_buffer.bytes);
+#if 0 /* debug */
+        snd_printk(KERN_DEBUG "prepare:channel_number=%d, rate=%d, "
+                   "format=0x%x, channels=%d, buffer_size=%ld, "
+                   "period_size=%ld, periods=%u, frames_to_bytes=%d\n",
+                   channel, runtime->rate, runtime->format, runtime->channels,
+                   runtime->buffer_size, runtime->period_size,
+                   runtime->periods, frames_to_bytes(runtime, 1));
+        snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, table_base=%p\n",
+                   runtime->dma_addr, runtime->dma_area, table_base);
+        snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",
+                   emu->p16v_buffer.addr, emu->p16v_buffer.area,
+                   emu->p16v_buffer.bytes);
+#endif /* debug */
         tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, channel);
         switch (runtime->rate) {
         case 44100:
@@ -379,7 +403,15 @@ static int snd_p16v_pcm_prepare_capture(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         int channel = substream->pcm->device - emu->p16v_device_offset;
         u32 tmp;
-        //printk("prepare capture:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size,  frames_to_bytes(runtime, 1));
+
+        /*
+        printk(KERN_DEBUG "prepare capture:channel_number=%d, rate=%d, "
+               "format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, "
+               "frames_to_bytes=%d\n",
+               channel, runtime->rate, runtime->format, runtime->channels,
+               runtime->buffer_size, runtime->period_size,
+               frames_to_bytes(runtime, 1));
+        */
         tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, channel);
         switch (runtime->rate) {
         case 44100:
@@ -459,13 +491,13 @@ static int snd_p16v_pcm_trigger_playback(struct snd_pcm_substream *substream,
                 runtime = s->runtime;
                 epcm = runtime->private_data;
                 channel = substream->pcm->device-emu->p16v_device_offset;
-                //snd_printk("p16v channel=%d\n",channel);
+                /* snd_printk(KERN_DEBUG "p16v channel=%d\n", channel); */
                 epcm->running = running;
                 basic |= (0x1<<channel);
                 inte |= (INTE2_PLAYBACK_CH_0_LOOP<<channel);
                 snd_pcm_trigger_done(s, substream);
         }
-        //snd_printk("basic=0x%x, inte=0x%x\n",basic, inte);
+        /* snd_printk(KERN_DEBUG "basic=0x%x, inte=0x%x\n", basic, inte); */
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
@@ -558,8 +590,13 @@ snd_p16v_pcm_pointer_capture(struct snd_pcm_substream *substream)
                 ptr -= runtime->buffer_size;
                 printk(KERN_WARNING "buffer capture limited!\n");
         }
-        //printk("ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n", ptr1, ptr2, ptr, (int)runtime->buffer_size, (int)runtime->period_size, (int)runtime->frame_bits, (int)runtime->rate);
-
+        /*
+        printk(KERN_DEBUG "ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, "
+               "buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n",
+               ptr1, ptr2, ptr, (int)runtime->buffer_size,
+               (int)runtime->period_size, (int)runtime->frame_bits,
+               (int)runtime->rate);
+        */
         return ptr;
 }
 
@@ -592,7 +629,10 @@ int snd_p16v_free(struct snd_emu10k1 *chip)
         // release the data
         if (chip->p16v_buffer.area) {
                 snd_dma_free_pages(&chip->p16v_buffer);
-                //snd_printk("period lables free: %p\n", &chip->p16v_buffer);
+                /*
+                snd_printk(KERN_DEBUG "period lables free: %p\n",
+                           &chip->p16v_buffer);
+                */
         }
         return 0;
 }
@@ -604,7 +644,7 @@ int __devinit snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm *
         int err;
         int capture=1;
   
-        //snd_printk("snd_p16v_pcm called. device=%d\n", device);
+        /* snd_printk("KERN_DEBUG snd_p16v_pcm called. device=%d\n", device); */
         emu->p16v_device_offset = device;
         if (rpcm)
                 *rpcm = NULL;
@@ -631,7 +671,10 @@ int __devinit snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm *
                                                          snd_dma_pci_data(emu->pci), 
                                                          ((65536 - 64) * 8), ((65536 - 64) * 8))) < 0) 
                         return err;
-                //snd_printk("preallocate playback substream: err=%d\n", err);
+                /*
+                snd_printk(KERN_DEBUG
+                           "preallocate playback substream: err=%d\n", err);
+                */
         }
 
         for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; 
@@ -642,7 +685,10 @@ int __devinit snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm *
                                                    snd_dma_pci_data(emu->pci), 
                                                    65536 - 64, 65536 - 64)) < 0)
                         return err;
-                //snd_printk("preallocate capture substream: err=%d\n", err);
+                /*
+                snd_printk(KERN_DEBUG
+                           "preallocate capture substream: err=%d\n", err);
+                */
         }
   
         if (rpcm)
diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c
index d7300a1aa262..20b8da250bd0 100644
--- a/sound/pci/emu10k1/voice.c
+++ b/sound/pci/emu10k1/voice.c
@@ -53,7 +53,10 @@ static int voice_alloc(struct snd_emu10k1 *emu, int type, int number,
         *rvoice = NULL;
         first_voice = last_voice = 0;
         for (i = emu->next_free_voice, j = 0; j < NUM_G ; i += number, j += number) {
-                // printk("i %d j %d next free %d!\n", i, j, emu->next_free_voice);
+                /*
+                printk(KERN_DEBUG "i %d j %d next free %d!\n",
+                       i, j, emu->next_free_voice);
+                */
                 i %= NUM_G;
 
                 /* stereo voices must be even/odd */
@@ -71,7 +74,7 @@ static int voice_alloc(struct snd_emu10k1 *emu, int type, int number,
                         }
                 }
                 if (!skip) {
-                        // printk("allocated voice %d\n", i);
+                        /* printk(KERN_DEBUG "allocated voice %d\n", i); */
                         first_voice = i;
                         last_voice = (i + number) % NUM_G;
                         emu->next_free_voice = last_voice;
@@ -84,7 +87,10 @@ static int voice_alloc(struct snd_emu10k1 *emu, int type, int number,
         
         for (i = 0; i < number; i++) {
                 voice = &emu->voices[(first_voice + i) % NUM_G];
-                // printk("voice alloc - %i, %i of %i\n", voice->number, idx-first_voice+1, number);
+                /*
+                printk(kERN_DEBUG "voice alloc - %i, %i of %i\n",
+                       voice->number, idx-first_voice+1, number);
+                */
                 voice->use = 1;
                 switch (type) {
                 case EMU10K1_PCM:
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 9bf95367c882..18f4d1e98c46 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -584,7 +584,8 @@ static void snd_es1370_codec_write(struct snd_ak4531 *ak4531,
         unsigned long end_time = jiffies + HZ / 10;
 
 #if 0
-        printk("CODEC WRITE: reg = 0x%x, val = 0x%x (0x%x), creg = 0x%x\n",
+        printk(KERN_DEBUG
+               "CODEC WRITE: reg = 0x%x, val = 0x%x (0x%x), creg = 0x%x\n",
                reg, val, ES_1370_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1370_CODEC));
 #endif
         do {
@@ -2409,9 +2410,9 @@ static int __devinit snd_audiopci_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         if ((err = snd_ensoniq_create(card, pci, &ensoniq)) < 0) {
                 snd_card_free(card);
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 4cd9a1faaecc..dd63b132fb8e 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1673,18 +1673,22 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id)
 
         status = inb(SLIO_REG(chip, IRQCONTROL));
 #if 0
-        printk("Es1938debug - interrupt status: =0x%x\n", status);
+        printk(KERN_DEBUG "Es1938debug - interrupt status: =0x%x\n", status);
 #endif
         
         /* AUDIO 1 */
         if (status & 0x10) {
 #if 0
-                printk("Es1938debug - AUDIO channel 1 interrupt\n");
-                printk("Es1938debug - AUDIO channel 1 DMAC DMA count: %u\n",
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 1 interrupt\n");
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 1 DMAC DMA count: %u\n",
                        inw(SLDM_REG(chip, DMACOUNT)));
-                printk("Es1938debug - AUDIO channel 1 DMAC DMA base: %u\n",
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 1 DMAC DMA base: %u\n",
                        inl(SLDM_REG(chip, DMAADDR)));
-                printk("Es1938debug - AUDIO channel 1 DMAC DMA status: 0x%x\n",
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 1 DMAC DMA status: 0x%x\n",
                        inl(SLDM_REG(chip, DMASTATUS)));
 #endif
                 /* clear irq */
@@ -1699,10 +1703,13 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id)
         /* AUDIO 2 */
         if (status & 0x20) {
 #if 0
-                printk("Es1938debug - AUDIO channel 2 interrupt\n");
-                printk("Es1938debug - AUDIO channel 2 DMAC DMA count: %u\n",
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 2 interrupt\n");
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 2 DMAC DMA count: %u\n",
                        inw(SLIO_REG(chip, AUDIO2DMACOUNT)));
-                printk("Es1938debug - AUDIO channel 2 DMAC DMA base: %u\n",
+                printk(KERN_DEBUG
+                       "Es1938debug - AUDIO channel 2 DMAC DMA base: %u\n",
                        inl(SLIO_REG(chip, AUDIO2DMAADDR)));
 
 #endif
@@ -1799,9 +1806,9 @@ static int __devinit snd_es1938_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
         for (idx = 0; idx < 5; idx++) {
                 if (pci_resource_start(pci, idx) == 0 ||
                     !(pci_resource_flags(pci, idx) & IORESOURCE_IO)) {
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index e9c3794bbcb8..dc97e8116141 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2645,9 +2645,9 @@ static int __devinit snd_es1968_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (!card)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
                 
         if (total_bufsize[dev] < 128)
                 total_bufsize[dev] = 128;
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index c129f9e2072c..60cdb9e0b68d 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1468,9 +1468,9 @@ static int __devinit snd_card_fm801_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
         if ((err = snd_fm801_create(card, pci, tea575x_tuner[dev], &chip)) < 0) {
                 snd_card_free(card);
                 return err;
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 960fd7970384..4de5bacd3929 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -138,6 +138,7 @@ void snd_hda_detach_beep_device(struct hda_codec *codec)
 
                 input_unregister_device(beep->dev);
                 kfree(beep);
+                codec->beep = NULL;
         }
 }
 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 b9679f081cae..51bf6a5daf39 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -39,7 +39,7 @@ struct hda_beep {
 int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);
 void snd_hda_detach_beep_device(struct hda_codec *codec);
 #else
-#define snd_hda_attach_beep_device(...)
+#define snd_hda_attach_beep_device(...)         0
 #define snd_hda_detach_beep_device(...)
 #endif
 #endif
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index d03f99298be9..a4e5e5952115 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -647,9 +647,9 @@ static void /*__devinit*/ setup_fg_nodes(struct hda_codec *codec)
 
         total_nodes = snd_hda_get_sub_nodes(codec, AC_NODE_ROOT, &nid);
         for (i = 0; i < total_nodes; i++, nid++) {
-                unsigned int func;
-                func = snd_hda_param_read(codec, nid, AC_PAR_FUNCTION_TYPE);
-                switch (func & 0xff) {
+                codec->function_id = snd_hda_param_read(codec, nid,
+                                                AC_PAR_FUNCTION_TYPE) & 0xff;
+                switch (codec->function_id) {
                 case AC_GRP_AUDIO_FUNCTION:
                         codec->afg = nid;
                         break;
@@ -682,11 +682,140 @@ static int read_widget_caps(struct hda_codec *codec, hda_nid_t fg_node)
         return 0;
 }
 
+/* read all pin default configurations and save codec->init_pins */
+static int read_pin_defaults(struct hda_codec *codec)
+{
+        int i;
+        hda_nid_t nid = codec->start_nid;
+
+        for (i = 0; i < codec->num_nodes; i++, nid++) {
+                struct hda_pincfg *pin;
+                unsigned int wcaps = get_wcaps(codec, nid);
+                unsigned int wid_type = (wcaps & AC_WCAP_TYPE) >>
+                                AC_WCAP_TYPE_SHIFT;
+                if (wid_type != AC_WID_PIN)
+                        continue;
+                pin = snd_array_new(&codec->init_pins);
+                if (!pin)
+                        return -ENOMEM;
+                pin->nid = nid;
+                pin->cfg = snd_hda_codec_read(codec, nid, 0,
+                                              AC_VERB_GET_CONFIG_DEFAULT, 0);
+        }
+        return 0;
+}
+
+/* look up the given pin config list and return the item matching with NID */
+static struct hda_pincfg *look_up_pincfg(struct hda_codec *codec,
+                                         struct snd_array *array,
+                                         hda_nid_t nid)
+{
+        int i;
+        for (i = 0; i < array->used; i++) {
+                struct hda_pincfg *pin = snd_array_elem(array, i);
+                if (pin->nid == nid)
+                        return pin;
+        }
+        return NULL;
+}
+
+/* write a config value for the given NID */
+static void set_pincfg(struct hda_codec *codec, hda_nid_t nid,
+                       unsigned int cfg)
+{
+        int i;
+        for (i = 0; i < 4; i++) {
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_0 + i,
+                                    cfg & 0xff);
+                cfg >>= 8;
+        }
+}
+
+/* set the current pin config value for the given NID.
+ * the value is cached, and read via snd_hda_codec_get_pincfg()
+ */
+int snd_hda_add_pincfg(struct hda_codec *codec, struct snd_array *list,
+                       hda_nid_t nid, unsigned int cfg)
+{
+        struct hda_pincfg *pin;
+        unsigned int oldcfg;
+
+        oldcfg = snd_hda_codec_get_pincfg(codec, nid);
+        pin = look_up_pincfg(codec, list, nid);
+        if (!pin) {
+                pin = snd_array_new(list);
+                if (!pin)
+                        return -ENOMEM;
+                pin->nid = nid;
+        }
+        pin->cfg = cfg;
+
+        /* change only when needed; e.g. if the pincfg is already present
+         * in user_pins[], don't write it
+         */
+        cfg = snd_hda_codec_get_pincfg(codec, nid);
+        if (oldcfg != cfg)
+                set_pincfg(codec, nid, cfg);
+        return 0;
+}
+
+int snd_hda_codec_set_pincfg(struct hda_codec *codec,
+                             hda_nid_t nid, unsigned int cfg)
+{
+        return snd_hda_add_pincfg(codec, &codec->driver_pins, nid, cfg);
+}
+EXPORT_SYMBOL_HDA(snd_hda_codec_set_pincfg);
+
+/* get the current pin config value of the given pin NID */
+unsigned int snd_hda_codec_get_pincfg(struct hda_codec *codec, hda_nid_t nid)
+{
+        struct hda_pincfg *pin;
+
+#ifdef CONFIG_SND_HDA_HWDEP
+        pin = look_up_pincfg(codec, &codec->user_pins, nid);
+        if (pin)
+                return pin->cfg;
+#endif
+        pin = look_up_pincfg(codec, &codec->driver_pins, nid);
+        if (pin)
+                return pin->cfg;
+        pin = look_up_pincfg(codec, &codec->init_pins, nid);
+        if (pin)
+                return pin->cfg;
+        return 0;
+}
+EXPORT_SYMBOL_HDA(snd_hda_codec_get_pincfg);
+
+/* restore all current pin configs */
+static void restore_pincfgs(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);
+                set_pincfg(codec, pin->nid,
+                           snd_hda_codec_get_pincfg(codec, pin->nid));
+        }
+}
 
 static void init_hda_cache(struct hda_cache_rec *cache,
                            unsigned int record_size);
 static void free_hda_cache(struct hda_cache_rec *cache);
 
+/* restore the initial pin cfgs and release all pincfg lists */
+static void restore_init_pincfgs(struct hda_codec *codec)
+{
+        /* first free driver_pins and user_pins, then call restore_pincfg
+         * so that only the values in init_pins are restored
+         */
+        snd_array_free(&codec->driver_pins);
+#ifdef CONFIG_SND_HDA_HWDEP
+        snd_array_free(&codec->user_pins);
+#endif
+        restore_pincfgs(codec);
+        snd_array_free(&codec->init_pins);
+}
+
 /*
  * codec destructor
  */
@@ -694,6 +823,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
 {
         if (!codec)
                 return;
+        restore_init_pincfgs(codec);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         cancel_delayed_work(&codec->power_work);
         flush_workqueue(codec->bus->workq);
@@ -712,6 +842,9 @@ static void snd_hda_codec_free(struct hda_codec *codec)
         kfree(codec);
 }
 
+static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
+                                unsigned int power_state);
+
 /**
  * snd_hda_codec_new - create a HDA codec
  * @bus: the bus to assign
@@ -751,6 +884,8 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr
         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->init_pins, sizeof(struct hda_pincfg), 16);
+        snd_array_init(&codec->driver_pins, sizeof(struct hda_pincfg), 16);
         if (codec->bus->modelname) {
                 codec->modelname = kstrdup(codec->bus->modelname, GFP_KERNEL);
                 if (!codec->modelname) {
@@ -787,15 +922,18 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr
         setup_fg_nodes(codec);
         if (!codec->afg && !codec->mfg) {
                 snd_printdd("hda_codec: no AFG or MFG node found\n");
-                snd_hda_codec_free(codec);
-                return -ENODEV;
+                err = -ENODEV;
+                goto error;
         }
 
-        if (read_widget_caps(codec, codec->afg ? codec->afg : codec->mfg) < 0) {
+        err = read_widget_caps(codec, codec->afg ? codec->afg : codec->mfg);
+        if (err < 0) {
                 snd_printk(KERN_ERR "hda_codec: cannot malloc\n");
-                snd_hda_codec_free(codec);
-                return -ENOMEM;
+                goto error;
         }
+        err = read_pin_defaults(codec);
+        if (err < 0)
+                goto error;
 
         if (!codec->subsystem_id) {
                 hda_nid_t nid = codec->afg ? codec->afg : codec->mfg;
@@ -806,12 +944,15 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr
         if (bus->modelname)
                 codec->modelname = kstrdup(bus->modelname, GFP_KERNEL);
 
+        /* power-up all before initialization */
+        hda_set_power_state(codec,
+                            codec->afg ? codec->afg : codec->mfg,
+                            AC_PWRST_D0);
+
         if (do_init) {
                 err = snd_hda_codec_configure(codec);
-                if (err < 0) {
-                        snd_hda_codec_free(codec);
-                        return err;
-                }
+                if (err < 0)
+                        goto error;
         }
         snd_hda_codec_proc_new(codec);
 
@@ -824,6 +965,10 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr
         if (codecp)
                 *codecp = codec;
         return 0;
+
+ error:
+        snd_hda_codec_free(codec);
+        return err;
 }
 EXPORT_SYMBOL_HDA(snd_hda_codec_new);
 
@@ -907,6 +1052,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_PINCAP_KEY(nid) (u32)((nid) + (0x02 << 24))
 #define INFO_AMP_CAPS   (1<<0)
 #define INFO_AMP_VOL(ch)        (1 << (1 + (ch)))
 
@@ -997,6 +1143,21 @@ int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,
 }
 EXPORT_SYMBOL_HDA(snd_hda_override_amp_caps);
 
+u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid)
+{
+        struct hda_amp_info *info;
+
+        info = get_alloc_amp_hash(codec, HDA_HASH_PINCAP_KEY(nid));
+        if (!info)
+                return 0;
+        if (!info->head.val) {
+                info->amp_caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
+                info->head.val |= INFO_AMP_CAPS;
+        }
+        return info->amp_caps;
+}
+EXPORT_SYMBOL_HDA(snd_hda_query_pin_caps);
+
 /*
  * read the current volume to info
  * if the cache exists, read the cache value.
@@ -1120,6 +1281,7 @@ int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol,
         u16 nid = get_amp_nid(kcontrol);
         u8 chs = get_amp_channels(kcontrol);
         int dir = get_amp_direction(kcontrol);
+        unsigned int ofs = get_amp_offset(kcontrol);
         u32 caps;
 
         caps = query_amp_caps(codec, nid, dir);
@@ -1131,6 +1293,8 @@ int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol,
                        kcontrol->id.name);
                 return -EINVAL;
         }
+        if (ofs < caps)
+                caps -= ofs;
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
         uinfo->count = chs == 3 ? 2 : 1;
         uinfo->value.integer.min = 0;
@@ -1139,6 +1303,32 @@ int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_info);
 
+
+static inline unsigned int
+read_amp_value(struct hda_codec *codec, hda_nid_t nid,
+               int ch, int dir, int idx, unsigned int ofs)
+{
+        unsigned int val;
+        val = snd_hda_codec_amp_read(codec, nid, ch, dir, idx);
+        val &= HDA_AMP_VOLMASK;
+        if (val >= ofs)
+                val -= ofs;
+        else
+                val = 0;
+        return val;
+}
+
+static inline int
+update_amp_value(struct hda_codec *codec, hda_nid_t nid,
+                 int ch, int dir, int idx, unsigned int ofs,
+                 unsigned int val)
+{
+        if (val > 0)
+                val += ofs;
+        return snd_hda_codec_amp_update(codec, nid, ch, dir, idx,
+                                        HDA_AMP_VOLMASK, val);
+}
+
 int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
@@ -1147,14 +1337,13 @@ int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,
         int chs = get_amp_channels(kcontrol);
         int dir = get_amp_direction(kcontrol);
         int idx = get_amp_index(kcontrol);
+        unsigned int ofs = get_amp_offset(kcontrol);
         long *valp = ucontrol->value.integer.value;
 
         if (chs & 1)
-                *valp++ = snd_hda_codec_amp_read(codec, nid, 0, dir, idx)
-                        & HDA_AMP_VOLMASK;
+                *valp++ = read_amp_value(codec, nid, 0, dir, idx, ofs);
         if (chs & 2)
-                *valp = snd_hda_codec_amp_read(codec, nid, 1, dir, idx)
-                        & HDA_AMP_VOLMASK;
+                *valp = read_amp_value(codec, nid, 1, dir, idx, ofs);
         return 0;
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_get);
@@ -1167,18 +1356,17 @@ int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,
         int chs = get_amp_channels(kcontrol);
         int dir = get_amp_direction(kcontrol);
         int idx = get_amp_index(kcontrol);
+        unsigned int ofs = get_amp_offset(kcontrol);
         long *valp = ucontrol->value.integer.value;
         int change = 0;
 
         snd_hda_power_up(codec);
         if (chs & 1) {
-                change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
-                                                  0x7f, *valp);
+                change = update_amp_value(codec, nid, 0, dir, idx, ofs, *valp);
                 valp++;
         }
         if (chs & 2)
-                change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
-                                                   0x7f, *valp);
+                change |= update_amp_value(codec, nid, 1, dir, idx, ofs, *valp);
         snd_hda_power_down(codec);
         return change;
 }
@@ -1190,6 +1378,7 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         hda_nid_t nid = get_amp_nid(kcontrol);
         int dir = get_amp_direction(kcontrol);
+        unsigned int ofs = get_amp_offset(kcontrol);
         u32 caps, val1, val2;
 
         if (size < 4 * sizeof(unsigned int))
@@ -1198,6 +1387,7 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
         val2 = (caps & AC_AMPCAP_STEP_SIZE) >> AC_AMPCAP_STEP_SIZE_SHIFT;
         val2 = (val2 + 1) * 25;
         val1 = -((caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT);
+        val1 += ofs;
         val1 = ((int)val1) * ((int)val2);
         if (put_user(SNDRV_CTL_TLVT_DB_SCALE, _tlv))
                 return -EFAULT;
@@ -1268,7 +1458,6 @@ int snd_hda_ctl_add(struct hda_codec *codec, struct snd_kcontrol *kctl)
 }
 EXPORT_SYMBOL_HDA(snd_hda_ctl_add);
 
-#ifdef CONFIG_SND_HDA_RECONFIG
 /* Clear all controls assigned to the given codec */
 void snd_hda_ctls_clear(struct hda_codec *codec)
 {
@@ -1279,9 +1468,52 @@ void snd_hda_ctls_clear(struct hda_codec *codec)
         snd_array_free(&codec->mixers);
 }
 
-void snd_hda_codec_reset(struct hda_codec *codec)
+/* pseudo device locking
+ * toggle card->shutdown to allow/disallow the device access (as a hack)
+ */
+static int hda_lock_devices(struct snd_card *card)
 {
-        int i;
+        spin_lock(&card->files_lock);
+        if (card->shutdown) {
+                spin_unlock(&card->files_lock);
+                return -EINVAL;
+        }
+        card->shutdown = 1;
+        spin_unlock(&card->files_lock);
+        return 0;
+}
+
+static void hda_unlock_devices(struct snd_card *card)
+{
+        spin_lock(&card->files_lock);
+        card->shutdown = 0;
+        spin_unlock(&card->files_lock);
+}
+
+int snd_hda_codec_reset(struct hda_codec *codec)
+{
+        struct snd_card *card = codec->bus->card;
+        int i, pcm;
+
+        if (hda_lock_devices(card) < 0)
+                return -EBUSY;
+        /* check whether the codec isn't used by any mixer or PCM streams */
+        if (!list_empty(&card->ctl_files)) {
+                hda_unlock_devices(card);
+                return -EBUSY;
+        }
+        for (pcm = 0; pcm < codec->num_pcms; pcm++) {
+                struct hda_pcm *cpcm = &codec->pcm_info[pcm];
+                if (!cpcm->pcm)
+                        continue;
+                if (cpcm->pcm->streams[0].substream_opened ||
+                    cpcm->pcm->streams[1].substream_opened) {
+                        hda_unlock_devices(card);
+                        return -EBUSY;
+                }
+        }
+
+        /* OK, let it free */
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         cancel_delayed_work(&codec->power_work);
@@ -1291,8 +1523,7 @@ void snd_hda_codec_reset(struct hda_codec *codec)
         /* relase PCMs */
         for (i = 0; i < codec->num_pcms; i++) {
                 if (codec->pcm_info[i].pcm) {
-                        snd_device_free(codec->bus->card,
-                                        codec->pcm_info[i].pcm);
+                        snd_device_free(card, codec->pcm_info[i].pcm);
                         clear_bit(codec->pcm_info[i].device,
                                   codec->bus->pcm_dev_bits);
                 }
@@ -1305,13 +1536,22 @@ void snd_hda_codec_reset(struct hda_codec *codec)
         free_hda_cache(&codec->cmd_cache);
         init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
         init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
+        /* free only driver_pins so that init_pins + user_pins are restored */
+        snd_array_free(&codec->driver_pins);
+        restore_pincfgs(codec);
         codec->num_pcms = 0;
         codec->pcm_info = NULL;
         codec->preset = NULL;
+        memset(&codec->patch_ops, 0, sizeof(codec->patch_ops));
+        codec->slave_dig_outs = NULL;
+        codec->spdif_status_reset = 0;
         module_put(codec->owner);
         codec->owner = NULL;
+
+        /* allow device access again */
+        hda_unlock_devices(card);
+        return 0;
 }
-#endif /* CONFIG_SND_HDA_RECONFIG */
 
 /* create a virtual master control and add slaves */
 int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
@@ -1336,15 +1576,20 @@ int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
         
         for (s = slaves; *s; s++) {
                 struct snd_kcontrol *sctl;
-
-                sctl = snd_hda_find_mixer_ctl(codec, *s);
-                if (!sctl) {
-                        snd_printdd("Cannot find slave %s, skipped\n", *s);
-                        continue;
+                int i = 0;
+                for (;;) {
+                        sctl = _snd_hda_find_mixer_ctl(codec, *s, i);
+                        if (!sctl) {
+                                if (!i)
+                                        snd_printdd("Cannot find slave %s, "
+                                                    "skipped\n", *s);
+                                break;
+                        }
+                        err = snd_ctl_add_slave(kctl, sctl);
+                        if (err < 0)
+                                return err;
+                        i++;
                 }
-                err = snd_ctl_add_slave(kctl, sctl);
-                if (err < 0)
-                        return err;
         }
         return 0;
 }
@@ -1955,6 +2200,8 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
         }
         for (dig_mix = dig_in_ctls; dig_mix->name; dig_mix++) {
                 kctl = snd_ctl_new1(dig_mix, codec);
+                if (!kctl)
+                        return -ENOMEM;
                 kctl->private_value = nid;
                 err = snd_hda_ctl_add(codec, kctl);
                 if (err < 0)
@@ -2074,8 +2321,7 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
                                  * don't power down the widget if it controls
                                  * eapd and EAPD_BTLENABLE is set.
                                  */
-                                pincap = snd_hda_param_read(codec, nid,
-                                                            AC_PAR_PIN_CAP);
+                                pincap = snd_hda_query_pin_caps(codec, nid);
                                 if (pincap & AC_PINCAP_EAPD) {
                                         int eapd = snd_hda_codec_read(codec,
                                                 nid, 0,
@@ -2144,6 +2390,7 @@ static void hda_call_codec_resume(struct hda_codec *codec)
         hda_set_power_state(codec,
                             codec->afg ? codec->afg : codec->mfg,
                             AC_PWRST_D0);
+        restore_pincfgs(codec); /* restore all current pin configs */
         hda_exec_init_verbs(codec);
         if (codec->patch_ops.resume)
                 codec->patch_ops.resume(codec);
@@ -2171,8 +2418,16 @@ 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)
-                        return err;
+                if (err < 0) {
+                        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
+                                       "hda_codec: cannot revert codec\n");
+                                return err;
+                        }
+                }
         }
         return 0;
 }
@@ -2181,19 +2436,12 @@ EXPORT_SYMBOL_HDA(snd_hda_build_controls);
 int snd_hda_codec_build_controls(struct hda_codec *codec)
 {
         int err = 0;
-        /* fake as if already powered-on */
-        hda_keep_power_on(codec);
-        /* then fire up */
-        hda_set_power_state(codec,
-                            codec->afg ? codec->afg : codec->mfg,
-                            AC_PWRST_D0);
         hda_exec_init_verbs(codec);
         /* continue to initialize... */
         if (codec->patch_ops.init)
                 err = codec->patch_ops.init(codec);
         if (!err && codec->patch_ops.build_controls)
                 err = codec->patch_ops.build_controls(codec);
-        snd_hda_power_down(codec);
         if (err < 0)
                 return err;
         return 0;
@@ -2306,12 +2554,11 @@ EXPORT_SYMBOL_HDA(snd_hda_calc_stream_format);
 static int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
                                 u32 *ratesp, u64 *formatsp, unsigned int *bpsp)
 {
-        int i;
-        unsigned int val, streams;
+        unsigned int i, val, wcaps;
 
         val = 0;
-        if (nid != codec->afg &&
-            (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD)) {
+        wcaps = get_wcaps(codec, nid);
+        if (nid != codec->afg && (wcaps & AC_WCAP_FORMAT_OVRD)) {
                 val = snd_hda_param_read(codec, nid, AC_PAR_PCM);
                 if (val == -1)
                         return -EIO;
@@ -2325,15 +2572,20 @@ static int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
                         if (val & (1 << i))
                                 rates |= rate_bits[i].alsa_bits;
                 }
+                if (rates == 0) {
+                        snd_printk(KERN_ERR "hda_codec: rates == 0 "
+                                   "(nid=0x%x, val=0x%x, ovrd=%i)\n",
+                                        nid, val,
+                                        (wcaps & AC_WCAP_FORMAT_OVRD) ? 1 : 0);
+                        return -EIO;
+                }
                 *ratesp = rates;
         }
 
         if (formatsp || bpsp) {
                 u64 formats = 0;
-                unsigned int bps;
-                unsigned int wcaps;
+                unsigned int streams, bps;
 
-                wcaps = get_wcaps(codec, nid);
                 streams = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
                 if (streams == -1)
                         return -EIO;
@@ -2386,6 +2638,15 @@ static int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
                         formats |= SNDRV_PCM_FMTBIT_U8;
                         bps = 8;
                 }
+                if (formats == 0) {
+                        snd_printk(KERN_ERR "hda_codec: formats == 0 "
+                                   "(nid=0x%x, val=0x%x, ovrd=%i, "
+                                   "streams=0x%x)\n",
+                                        nid, val,
+                                        (wcaps & AC_WCAP_FORMAT_OVRD) ? 1 : 0,
+                                        streams);
+                        return -EIO;
+                }
                 if (formatsp)
                         *formatsp = formats;
                 if (bpsp)
@@ -2501,12 +2762,16 @@ static int hda_pcm_default_cleanup(struct hda_pcm_stream *hinfo,
 static int set_pcm_default_values(struct hda_codec *codec,
                                   struct hda_pcm_stream *info)
 {
+        int err;
+
         /* query support PCM information from the given NID */
         if (info->nid && (!info->rates || !info->formats)) {
-                snd_hda_query_supported_pcm(codec, info->nid,
+                err = snd_hda_query_supported_pcm(codec, info->nid,
                                 info->rates ? NULL : &info->rates,
                                 info->formats ? NULL : &info->formats,
                                 info->maxbps ? NULL : &info->maxbps);
+                if (err < 0)
+                        return err;
         }
         if (info->ops.open == NULL)
                 info->ops.open = hda_pcm_default_open_close;
@@ -2549,13 +2814,10 @@ static int get_empty_pcm_device(struct hda_bus *bus, int type)
                 for (i = 0; i < ARRAY_SIZE(audio_idx); i++) {
                         dev = audio_idx[i];
                         if (!test_bit(dev, bus->pcm_dev_bits))
-                                break;
-                }
-                if (i >= ARRAY_SIZE(audio_idx)) {
-                        snd_printk(KERN_WARNING "Too many audio devices\n");
-                        return -EAGAIN;
+                                goto ok;
                 }
-                break;
+                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:
@@ -2570,6 +2832,7 @@ static int get_empty_pcm_device(struct hda_bus *bus, int type)
                 snd_printk(KERN_WARNING "Invalid PCM type %d\n", type);
                 return -EINVAL;
         }
+ ok:
         set_bit(dev, bus->pcm_dev_bits);
         return dev;
 }
@@ -2606,24 +2869,36 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec)
                 if (!codec->patch_ops.build_pcms)
                         return 0;
                 err = codec->patch_ops.build_pcms(codec);
-                if (err < 0)
-                        return err;
+                if (err < 0) {
+                        printk(KERN_ERR "hda_codec: cannot build PCMs"
+                               "for #%d (error %d)\n", codec->addr, err); 
+                        err = snd_hda_codec_reset(codec);
+                        if (err < 0) {
+                                printk(KERN_ERR
+                                       "hda_codec: cannot revert codec\n");
+                                return err;
+                        }
+                }
         }
         for (pcm = 0; pcm < codec->num_pcms; pcm++) {
                 struct hda_pcm *cpcm = &codec->pcm_info[pcm];
                 int dev;
 
                 if (!cpcm->stream[0].substreams && !cpcm->stream[1].substreams)
-                        return 0; /* no substreams assigned */
+                        continue; /* no substreams assigned */
 
                 if (!cpcm->pcm) {
                         dev = get_empty_pcm_device(codec->bus, cpcm->pcm_type);
                         if (dev < 0)
-                                return 0;
+                                continue; /* no fatal error */
                         cpcm->device = dev;
                         err = snd_hda_attach_pcm(codec, cpcm);
-                        if (err < 0)
-                                return err;
+                        if (err < 0) {
+                                printk(KERN_ERR "hda_codec: cannot attach "
+                                       "PCM stream %d for codec #%d\n",
+                                       dev, codec->addr);
+                                continue; /* no fatal error */
+                        }
                 }
         }
         return 0;
@@ -3324,8 +3599,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                 if (ignore_nids && is_in_nid_list(nid, ignore_nids))
                         continue;
 
-                def_conf = snd_hda_codec_read(codec, nid, 0,
-                                              AC_VERB_GET_CONFIG_DEFAULT, 0);
+                def_conf = snd_hda_codec_get_pincfg(codec, nid);
                 if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)
                         continue;
                 loc = get_defcfg_location(def_conf);
@@ -3401,10 +3675,22 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                         cfg->input_pins[AUTO_PIN_AUX] = nid;
                         break;
                 case AC_JACK_SPDIF_OUT:
-                        cfg->dig_out_pin = nid;
+                case AC_JACK_DIG_OTHER_OUT:
+                        if (cfg->dig_outs >= ARRAY_SIZE(cfg->dig_out_pins))
+                                continue;
+                        cfg->dig_out_pins[cfg->dig_outs] = nid;
+                        cfg->dig_out_type[cfg->dig_outs] =
+                                (loc == AC_JACK_LOC_HDMI) ?
+                                HDA_PCM_TYPE_HDMI : HDA_PCM_TYPE_SPDIF;
+                        cfg->dig_outs++;
                         break;
                 case AC_JACK_SPDIF_IN:
+                case AC_JACK_DIG_OTHER_IN:
                         cfg->dig_in_pin = nid;
+                        if (loc == AC_JACK_LOC_HDMI)
+                                cfg->dig_in_type = HDA_PCM_TYPE_HDMI;
+                        else
+                                cfg->dig_in_type = HDA_PCM_TYPE_SPDIF;
                         break;
                 }
         }
@@ -3510,6 +3796,9 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                    cfg->hp_pins[1], cfg->hp_pins[2],
                    cfg->hp_pins[3], cfg->hp_pins[4]);
         snd_printd("   mono: mono_out=0x%x\n", cfg->mono_out_pin);
+        if (cfg->dig_outs)
+                snd_printd("   dig-out=0x%x/0x%x\n",
+                           cfg->dig_out_pins[0], cfg->dig_out_pins[1]);
         snd_printd("   inputs: mic=0x%x, fmic=0x%x, line=0x%x, fline=0x%x,"
                    " cd=0x%x, aux=0x%x\n",
                    cfg->input_pins[AUTO_PIN_MIC],
@@ -3518,6 +3807,8 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                    cfg->input_pins[AUTO_PIN_FRONT_LINE],
                    cfg->input_pins[AUTO_PIN_CD],
                    cfg->input_pins[AUTO_PIN_AUX]);
+        if (cfg->dig_in_pin)
+                snd_printd("   dig-in=0x%x\n", cfg->dig_in_pin);
 
         return 0;
 }
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 09a332ada0c6..2fdecf4b0eb6 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -739,6 +739,7 @@ struct hda_codec {
         hda_nid_t mfg;  /* MFG node id */
 
         /* ids */
+        u32 function_id;
         u32 vendor_id;
         u32 subsystem_id;
         u32 revision_id;
@@ -778,11 +779,14 @@ struct hda_codec {
         unsigned short spdif_ctls;      /* SPDIF control bits */
         unsigned int spdif_in_enable;   /* SPDIF input enable? */
         hda_nid_t *slave_dig_outs; /* optional digital out slave widgets */
+        struct snd_array init_pins;     /* initial (BIOS) pin configurations */
+        struct snd_array driver_pins;   /* pin configs set by codec parser */
 
 #ifdef CONFIG_SND_HDA_HWDEP
         struct snd_hwdep *hwdep;        /* assigned hwdep device */
         struct snd_array init_verbs;    /* additional init verbs */
         struct snd_array hints;         /* additional hints */
+        struct snd_array user_pins;     /* default pin configs to override */
 #endif
 
         /* misc flags */
@@ -790,6 +794,9 @@ struct hda_codec {
                                              * status change
                                              * (e.g. Realtek codecs)
                                              */
+        unsigned int pin_amp_workaround:1; /* pin out-amp takes index
+                                            * (e.g. Conexant codecs)
+                                            */
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         unsigned int power_on :1;       /* current (global) power-state */
         unsigned int power_transition :1; /* power-state in transition */
@@ -855,6 +862,18 @@ void snd_hda_codec_resume_cache(struct hda_codec *codec);
 #define snd_hda_sequence_write_cache    snd_hda_sequence_write
 #endif
 
+/* the struct for codec->pin_configs */
+struct hda_pincfg {
+        hda_nid_t nid;
+        unsigned int cfg;
+};
+
+unsigned int snd_hda_codec_get_pincfg(struct hda_codec *codec, hda_nid_t nid);
+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 */
+
 /*
  * Mixer
  */
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 65745e96dc70..1d5797a96682 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -144,9 +144,9 @@ static int add_new_node(struct hda_codec *codec, struct hda_gspec *spec, hda_nid
         node->type = (node->wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
 
         if (node->type == AC_WID_PIN) {
-                node->pin_caps = snd_hda_param_read(codec, node->nid, AC_PAR_PIN_CAP);
+                node->pin_caps = snd_hda_query_pin_caps(codec, node->nid);
                 node->pin_ctl = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-                node->def_cfg = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                node->def_cfg = snd_hda_codec_get_pincfg(codec, node->nid);
         }
 
         if (node->wid_caps & AC_WCAP_OUT_AMP) {
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 4ae51dcb81af..1c57505c2874 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -30,6 +30,12 @@
 #include <sound/hda_hwdep.h>
 #include <sound/minors.h>
 
+/* hint string pair */
+struct hda_hint {
+        const char *key;
+        const char *val;        /* contained in the same alloc as key */
+};
+
 /*
  * write/read an out-of-bound verb
  */
@@ -99,16 +105,17 @@ static int hda_hwdep_open(struct snd_hwdep *hw, struct file *file)
 
 static void clear_hwdep_elements(struct hda_codec *codec)
 {
-        char **head;
         int i;
 
         /* clear init verbs */
         snd_array_free(&codec->init_verbs);
         /* clear hints */
-        head = codec->hints.list;
-        for (i = 0; i < codec->hints.used; i++, head++)
-                kfree(*head);
+        for (i = 0; i < codec->hints.used; i++) {
+                struct hda_hint *hint = snd_array_elem(&codec->hints, i);
+                kfree(hint->key); /* we don't need to free hint->val */
+        }
         snd_array_free(&codec->hints);
+        snd_array_free(&codec->user_pins);
 }
 
 static void hwdep_free(struct snd_hwdep *hwdep)
@@ -140,7 +147,8 @@ int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec)
 #endif
 
         snd_array_init(&codec->init_verbs, sizeof(struct hda_verb), 32);
-        snd_array_init(&codec->hints, sizeof(char *), 32);
+        snd_array_init(&codec->hints, sizeof(struct hda_hint), 32);
+        snd_array_init(&codec->user_pins, sizeof(struct hda_pincfg), 16);
 
         return 0;
 }
@@ -153,7 +161,13 @@ int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec)
 
 static int clear_codec(struct hda_codec *codec)
 {
-        snd_hda_codec_reset(codec);
+        int err;
+
+        err = snd_hda_codec_reset(codec);
+        if (err < 0) {
+                snd_printk(KERN_ERR "The codec is being used, can't free.\n");
+                return err;
+        }
         clear_hwdep_elements(codec);
         return 0;
 }
@@ -162,20 +176,29 @@ static int reconfig_codec(struct hda_codec *codec)
 {
         int err;
 
+        snd_hda_power_up(codec);
         snd_printk(KERN_INFO "hda-codec: reconfiguring\n");
-        snd_hda_codec_reset(codec);
+        err = snd_hda_codec_reset(codec);
+        if (err < 0) {
+                snd_printk(KERN_ERR
+                           "The codec is being used, can't reconfigure.\n");
+                goto error;
+        }
         err = snd_hda_codec_configure(codec);
         if (err < 0)
-                return err;
+                goto error;
         /* rebuild PCMs */
         err = snd_hda_codec_build_pcms(codec);
         if (err < 0)
-                return err;
+                goto error;
         /* rebuild mixers */
         err = snd_hda_codec_build_controls(codec);
         if (err < 0)
-                return err;
-        return snd_card_register(codec->bus->card);
+                goto error;
+        err = snd_card_register(codec->bus->card);
+ error:
+        snd_hda_power_down(codec);
+        return err;
 }
 
 /*
@@ -271,6 +294,22 @@ static ssize_t type##_store(struct device *dev,			\
 CODEC_ACTION_STORE(reconfig);
 CODEC_ACTION_STORE(clear);
 
+static ssize_t init_verbs_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;
+        int i, len = 0;
+        for (i = 0; i < codec->init_verbs.used; i++) {
+                struct hda_verb *v = snd_array_elem(&codec->init_verbs, i);
+                len += snprintf(buf + len, PAGE_SIZE - len,
+                                "0x%02x 0x%03x 0x%04x\n",
+                                v->nid, v->verb, v->param);
+        }
+        return len;
+}
+
 static ssize_t init_verbs_store(struct device *dev,
                                 struct device_attribute *attr,
                                 const char *buf, size_t count)
@@ -293,26 +332,157 @@ static ssize_t init_verbs_store(struct device *dev,
         return count;
 }
 
+static ssize_t hints_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;
+        int i, len = 0;
+        for (i = 0; i < codec->hints.used; i++) {
+                struct hda_hint *hint = snd_array_elem(&codec->hints, i);
+                len += snprintf(buf + len, PAGE_SIZE - len,
+                                "%s = %s\n", hint->key, hint->val);
+        }
+        return len;
+}
+
+static struct hda_hint *get_hint(struct hda_codec *codec, const char *key)
+{
+        int i;
+
+        for (i = 0; i < codec->hints.used; i++) {
+                struct hda_hint *hint = snd_array_elem(&codec->hints, i);
+                if (!strcmp(hint->key, key))
+                        return hint;
+        }
+        return NULL;
+}
+
+static void remove_trail_spaces(char *str)
+{
+        char *p;
+        if (!*str)
+                return;
+        p = str + strlen(str) - 1;
+        for (; isspace(*p); p--) {
+                *p = 0;
+                if (p == str)
+                        return;
+        }
+}
+
+#define MAX_HINTS       1024
+
 static ssize_t hints_store(struct device *dev,
                            struct device_attribute *attr,
                            const char *buf, size_t count)
 {
         struct snd_hwdep *hwdep = dev_get_drvdata(dev);
         struct hda_codec *codec = hwdep->private_data;
-        char *p;
-        char **hint;
+        char *key, *val;
+        struct hda_hint *hint;
 
-        if (!*buf || isspace(*buf) || *buf == '#' || *buf == '\n')
+        while (isspace(*buf))
+                buf++;
+        if (!*buf || *buf == '#' || *buf == '\n')
                 return count;
-        p = kstrndup_noeol(buf, 1024);
-        if (!p)
+        if (*buf == '=')
+                return -EINVAL;
+        key = kstrndup_noeol(buf, 1024);
+        if (!key)
                 return -ENOMEM;
-        hint = snd_array_new(&codec->hints);
+        /* extract key and val */
+        val = strchr(key, '=');
+        if (!val) {
+                kfree(key);
+                return -EINVAL;
+        }
+        *val++ = 0;
+        while (isspace(*val))
+                val++;
+        remove_trail_spaces(key);
+        remove_trail_spaces(val);
+        hint = get_hint(codec, key);
+        if (hint) {
+                /* replace */
+                kfree(hint->key);
+                hint->key = key;
+                hint->val = val;
+                return count;
+        }
+        /* allocate a new hint entry */
+        if (codec->hints.used >= MAX_HINTS)
+                hint = NULL;
+        else
+                hint = snd_array_new(&codec->hints);
         if (!hint) {
-                kfree(p);
+                kfree(key);
                 return -ENOMEM;
         }
-        *hint = p;
+        hint->key = key;
+        hint->val = val;
+        return count;
+}
+
+static ssize_t pin_configs_show(struct hda_codec *codec,
+                                struct snd_array *list,
+                                char *buf)
+{
+        int i, len = 0;
+        for (i = 0; i < list->used; i++) {
+                struct hda_pincfg *pin = snd_array_elem(list, i);
+                len += sprintf(buf + len, "0x%02x 0x%08x\n",
+                               pin->nid, pin->cfg);
+        }
+        return len;
+}
+
+static ssize_t init_pin_configs_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;
+        return pin_configs_show(codec, &codec->init_pins, buf);
+}
+
+static ssize_t user_pin_configs_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;
+        return pin_configs_show(codec, &codec->user_pins, buf);
+}
+
+static ssize_t driver_pin_configs_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;
+        return pin_configs_show(codec, &codec->driver_pins, buf);
+}
+
+#define MAX_PIN_CONFIGS         32
+
+static ssize_t user_pin_configs_store(struct device *dev,
+                                      struct device_attribute *attr,
+                                      const char *buf, size_t count)
+{
+        struct snd_hwdep *hwdep = dev_get_drvdata(dev);
+        struct hda_codec *codec = hwdep->private_data;
+        int nid, cfg;
+        int err;
+
+        if (sscanf(buf, "%i %i", &nid, &cfg) != 2)
+                return -EINVAL;
+        if (!nid)
+                return -EINVAL;
+        err = snd_hda_add_pincfg(codec, &codec->user_pins, nid, cfg);
+        if (err < 0)
+                return err;
         return count;
 }
 
@@ -331,8 +501,11 @@ static struct device_attribute codec_attrs[] = {
         CODEC_ATTR_RO(mfg),
         CODEC_ATTR_RW(name),
         CODEC_ATTR_RW(modelname),
-        CODEC_ATTR_WO(init_verbs),
-        CODEC_ATTR_WO(hints),
+        CODEC_ATTR_RW(init_verbs),
+        CODEC_ATTR_RW(hints),
+        CODEC_ATTR_RO(init_pin_configs),
+        CODEC_ATTR_RW(user_pin_configs),
+        CODEC_ATTR_RO(driver_pin_configs),
         CODEC_ATTR_WO(reconfig),
         CODEC_ATTR_WO(clear),
 };
@@ -351,4 +524,29 @@ int snd_hda_hwdep_add_sysfs(struct hda_codec *codec)
         return 0;
 }
 
+/*
+ * Look for hint string
+ */
+const char *snd_hda_get_hint(struct hda_codec *codec, const char *key)
+{
+        struct hda_hint *hint = get_hint(codec, key);
+        return hint ? hint->val : NULL;
+}
+EXPORT_SYMBOL_HDA(snd_hda_get_hint);
+
+int snd_hda_get_bool_hint(struct hda_codec *codec, const char *key)
+{
+        const char *p = snd_hda_get_hint(codec, key);
+        if (!p || !*p)
+                return -ENOENT;
+        switch (toupper(*p)) {
+        case 'T': /* true */
+        case 'Y': /* yes */
+        case '1':
+                return 1;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_HDA(snd_hda_get_bool_hint);
+
 #endif /* CONFIG_SND_HDA_RECONFIG */
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index f3b5723c2859..30829ee920c3 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -381,6 +381,7 @@ struct azx {
 
         /* HD codec */
         unsigned short codec_mask;
+        int  codec_probe_mask; /* copied from probe_mask option */
         struct hda_bus *bus;
 
         /* CORB/RIRB */
@@ -858,13 +859,18 @@ static void azx_stream_start(struct azx *chip, struct azx_dev *azx_dev)
                       SD_CTL_DMA_START | SD_INT_MASK);
 }
 
-/* stop a stream */
-static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
+/* stop DMA */
+static void azx_stream_clear(struct azx *chip, struct azx_dev *azx_dev)
 {
-        /* stop DMA */
         azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &
                       ~(SD_CTL_DMA_START | SD_INT_MASK));
         azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
+}
+
+/* stop a stream */
+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));
@@ -1075,8 +1081,7 @@ static int azx_setup_periods(struct azx *chip,
         azx_sd_writel(azx_dev, SD_BDLPL, 0);
         azx_sd_writel(azx_dev, SD_BDLPU, 0);
 
-        period_bytes = snd_pcm_lib_period_bytes(substream);
-        azx_dev->period_bytes = period_bytes;
+        period_bytes = azx_dev->period_bytes;
         periods = azx_dev->bufsize / period_bytes;
 
         /* program the initial BDL entries */
@@ -1123,24 +1128,17 @@ static int azx_setup_periods(struct azx *chip,
  error:
         snd_printk(KERN_ERR "Too many BDL entries: buffer=%d, period=%d\n",
                    azx_dev->bufsize, period_bytes);
-        /* reset */
-        azx_sd_writel(azx_dev, SD_BDLPL, 0);
-        azx_sd_writel(azx_dev, SD_BDLPU, 0);
         return -EINVAL;
 }
 
-/*
- * set up the SD for streaming
- */
-static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
+/* reset stream */
+static void azx_stream_reset(struct azx *chip, struct azx_dev *azx_dev)
 {
         unsigned char val;
         int timeout;
 
-        /* make sure the run bit is zero for SD */
-        azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &
-                      ~SD_CTL_DMA_START);
-        /* reset stream */
+        azx_stream_clear(chip, azx_dev);
+
         azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) |
                       SD_CTL_STREAM_RESET);
         udelay(3);
@@ -1157,7 +1155,15 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
         while (((val = azx_sd_readb(azx_dev, SD_CTL)) & SD_CTL_STREAM_RESET) &&
                --timeout)
                 ;
+}
 
+/*
+ * set up the SD for streaming
+ */
+static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
+{
+        /* make sure the run bit is zero for SD */
+        azx_stream_clear(chip, azx_dev);
         /* program the stream_tag */
         azx_sd_writel(azx_dev, SD_CTL,
                       (azx_sd_readl(azx_dev, SD_CTL) & ~SD_CTL_STREAM_TAG_MASK)|
@@ -1228,7 +1234,6 @@ static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] __devinitdata = {
 };
 
 static int __devinit azx_codec_create(struct azx *chip, const char *model,
-                                      unsigned int codec_probe_mask,
                                       int no_init)
 {
         struct hda_bus_template bus_temp;
@@ -1261,7 +1266,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model,
 
         /* First try to probe all given codec slots */
         for (c = 0; c < max_slots; c++) {
-                if ((chip->codec_mask & (1 << c)) & codec_probe_mask) {
+                if ((chip->codec_mask & (1 << c)) & chip->codec_probe_mask) {
                         if (probe_codec(chip, c) < 0) {
                                 /* Some BIOSen give you wrong codec addresses
                                  * that don't exist
@@ -1285,7 +1290,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model,
 
         /* Then create codec instances */
         for (c = 0; c < max_slots; c++) {
-                if ((chip->codec_mask & (1 << c)) & codec_probe_mask) {
+                if ((chip->codec_mask & (1 << c)) & chip->codec_probe_mask) {
                         struct hda_codec *codec;
                         err = snd_hda_codec_new(chip->bus, c, !no_init, &codec);
                         if (err < 0)
@@ -1403,6 +1408,8 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
         runtime->private_data = azx_dev;
         snd_pcm_set_sync(substream);
         mutex_unlock(&chip->open_mutex);
+
+        azx_stream_reset(chip, azx_dev);
         return 0;
 }
 
@@ -1429,6 +1436,11 @@ static int azx_pcm_close(struct snd_pcm_substream *substream)
 static int azx_pcm_hw_params(struct snd_pcm_substream *substream,
                              struct snd_pcm_hw_params *hw_params)
 {
+        struct azx_dev *azx_dev = get_azx_dev(substream);
+
+        azx_dev->bufsize = 0;
+        azx_dev->period_bytes = 0;
+        azx_dev->format_val = 0;
         return snd_pcm_lib_malloc_pages(substream,
                                         params_buffer_bytes(hw_params));
 }
@@ -1443,6 +1455,9 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
         azx_sd_writel(azx_dev, SD_BDLPL, 0);
         azx_sd_writel(azx_dev, SD_BDLPU, 0);
         azx_sd_writel(azx_dev, SD_CTL, 0);
+        azx_dev->bufsize = 0;
+        azx_dev->period_bytes = 0;
+        azx_dev->format_val = 0;
 
         hinfo->ops.cleanup(hinfo, apcm->codec, substream);
 
@@ -1456,23 +1471,37 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
         struct azx_dev *azx_dev = get_azx_dev(substream);
         struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];
         struct snd_pcm_runtime *runtime = substream->runtime;
+        unsigned int bufsize, period_bytes, format_val;
+        int err;
 
-        azx_dev->bufsize = snd_pcm_lib_buffer_bytes(substream);
-        azx_dev->format_val = snd_hda_calc_stream_format(runtime->rate,
-                                                         runtime->channels,
-                                                         runtime->format,
-                                                         hinfo->maxbps);
-        if (!azx_dev->format_val) {
+        format_val = snd_hda_calc_stream_format(runtime->rate,
+                                                runtime->channels,
+                                                runtime->format,
+                                                hinfo->maxbps);
+        if (!format_val) {
                 snd_printk(KERN_ERR SFX
                            "invalid format_val, rate=%d, ch=%d, format=%d\n",
                            runtime->rate, runtime->channels, runtime->format);
                 return -EINVAL;
         }
 
+        bufsize = snd_pcm_lib_buffer_bytes(substream);
+        period_bytes = snd_pcm_lib_period_bytes(substream);
+
         snd_printdd("azx_pcm_prepare: bufsize=0x%x, format=0x%x\n",
-                    azx_dev->bufsize, azx_dev->format_val);
-        if (azx_setup_periods(chip, substream, azx_dev) < 0)
-                return -EINVAL;
+                    bufsize, format_val);
+
+        if (bufsize != azx_dev->bufsize ||
+            period_bytes != azx_dev->period_bytes ||
+            format_val != azx_dev->format_val) {
+                azx_dev->bufsize = bufsize;
+                azx_dev->period_bytes = period_bytes;
+                azx_dev->format_val = format_val;
+                err = azx_setup_periods(chip, substream, azx_dev);
+                if (err < 0)
+                        return err;
+        }
+
         azx_setup_controller(chip, azx_dev);
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 azx_dev->fifo_size = azx_sd_readw(azx_dev, SD_FIFOSIZE) + 1;
@@ -2100,25 +2129,36 @@ static struct snd_pci_quirk probe_mask_list[] __devinitdata = {
         SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01),
         /* including bogus ALC268 in slot#2 that conflicts with ALC888 */
         SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01),
-        /* conflict of ALC268 in slot#3 (digital I/O); a temporary fix */
-        SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba laptop", 0x03),
+        /* forced codec slots */
+        SND_PCI_QUIRK(0x1046, 0x1262, "ASUS W5F", 0x103),
         {}
 };
 
+#define AZX_FORCE_CODEC_MASK    0x100
+
 static void __devinit check_probe_mask(struct azx *chip, int dev)
 {
         const struct snd_pci_quirk *q;
 
-        if (probe_mask[dev] == -1) {
+        chip->codec_probe_mask = probe_mask[dev];
+        if (chip->codec_probe_mask == -1) {
                 q = snd_pci_quirk_lookup(chip->pci, probe_mask_list);
                 if (q) {
                         printk(KERN_INFO
                                "hda_intel: probe_mask set to 0x%x "
                                "for device %04x:%04x\n",
                                q->value, q->subvendor, q->subdevice);
-                        probe_mask[dev] = q->value;
+                        chip->codec_probe_mask = q->value;
                 }
         }
+
+        /* check forced option */
+        if (chip->codec_probe_mask != -1 &&
+            (chip->codec_probe_mask & AZX_FORCE_CODEC_MASK)) {
+                chip->codec_mask = chip->codec_probe_mask & 0xff;
+                printk(KERN_INFO "hda_intel: codec_mask forced to 0x%x\n",
+                       chip->codec_mask);
+        }
 }
 
 
@@ -2347,10 +2387,10 @@ static int __devinit azx_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (!card) {
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0) {
                 snd_printk(KERN_ERR SFX "Error creating card!\n");
-                return -ENOMEM;
+                return err;
         }
 
         err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
@@ -2359,8 +2399,7 @@ static int __devinit azx_probe(struct pci_dev *pci,
         card->private_data = chip;
 
         /* create codec instances */
-        err = azx_codec_create(chip, model[dev], probe_mask[dev],
-                               probe_only[dev]);
+        err = azx_codec_create(chip, model[dev], probe_only[dev]);
         if (err < 0)
                 goto out_free;
 
@@ -2457,10 +2496,10 @@ static struct pci_device_id azx_ids[] = {
         { PCI_DEVICE(0x10de, 0x0ac1), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x0ac2), .driver_data = AZX_DRIVER_NVIDIA },
         { PCI_DEVICE(0x10de, 0x0ac3), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0bd4), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0bd5), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0bd6), .driver_data = AZX_DRIVER_NVIDIA },
-        { PCI_DEVICE(0x10de, 0x0bd7), .driver_data = AZX_DRIVER_NVIDIA },
+        { 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 },
         /* Teradici */
         { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA },
         /* AMD Generic, PCI class code and Vendor ID for HD Audio */
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 44f189cb97ae..83349013b4df 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -26,8 +26,10 @@
 /*
  * for mixer controls
  */
+#define HDA_COMPOSE_AMP_VAL_OFS(nid,chs,idx,dir,ofs)            \
+        ((nid) | ((chs)<<16) | ((dir)<<18) | ((idx)<<19) | ((ofs)<<23))
 #define HDA_COMPOSE_AMP_VAL(nid,chs,idx,dir) \
-        ((nid) | ((chs)<<16) | ((dir)<<18) | ((idx)<<19))
+        HDA_COMPOSE_AMP_VAL_OFS(nid, chs, idx, dir, 0)
 /* 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,  \
@@ -96,7 +98,7 @@ struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
                                             const char *name);
 int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
                         unsigned int *tlv, const char **slaves);
-void snd_hda_codec_reset(struct hda_codec *codec);
+int snd_hda_codec_reset(struct hda_codec *codec);
 int snd_hda_codec_configure(struct hda_codec *codec);
 
 /* amp value bits */
@@ -134,7 +136,7 @@ extern struct hda_ctl_ops snd_hda_bind_sw;	/* for bind-switch */
 
 struct hda_bind_ctls {
         struct hda_ctl_ops *ops;
-        long values[];
+        unsigned long values[];
 };
 
 int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
@@ -227,6 +229,7 @@ struct hda_multi_out {
         hda_nid_t hp_nid;       /* optional DAC for HP, 0 when not exists */
         hda_nid_t extra_out_nid[3];     /* optional DACs, 0 when not exists */
         hda_nid_t dig_out_nid;  /* digital out audio widget */
+        hda_nid_t *slave_dig_outs;
         int max_channels;       /* currently supported analog channels */
         int dig_out_used;       /* current usage of digital out (HDA_DIG_XXX) */
         int no_share_stream;    /* don't share a stream with multiple pins */
@@ -354,9 +357,12 @@ struct auto_pin_cfg {
         int line_out_type;      /* AUTO_PIN_XXX_OUT */
         hda_nid_t hp_pins[AUTO_CFG_MAX_OUTS];
         hda_nid_t input_pins[AUTO_PIN_LAST];
-        hda_nid_t dig_out_pin;
+        int dig_outs;
+        hda_nid_t dig_out_pins[2];
         hda_nid_t dig_in_pin;
         hda_nid_t mono_out_pin;
+        int dig_out_type[2]; /* HDA_PCM_TYPE_XXX */
+        int dig_in_type; /* HDA_PCM_TYPE_XXX */
 };
 
 #define get_defcfg_connect(cfg) \
@@ -405,6 +411,7 @@ static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid)
 u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction);
 int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,
                               unsigned int caps);
+u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid);
 
 int snd_hda_ctl_add(struct hda_codec *codec, struct snd_kcontrol *kctl);
 void snd_hda_ctls_clear(struct hda_codec *codec);
@@ -427,6 +434,23 @@ static inline int snd_hda_hwdep_add_sysfs(struct hda_codec *codec)
 }
 #endif
 
+#ifdef CONFIG_SND_HDA_RECONFIG
+const char *snd_hda_get_hint(struct hda_codec *codec, const char *key);
+int snd_hda_get_bool_hint(struct hda_codec *codec, const char *key);
+#else
+static inline
+const char *snd_hda_get_hint(struct hda_codec *codec, const char *key)
+{
+        return NULL;
+}
+
+static inline
+int snd_hda_get_bool_hint(struct hda_codec *codec, const char *key)
+{
+        return -ENOENT;
+}
+#endif
+
 /*
  * power-management
  */
@@ -458,6 +482,7 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec,
 #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)
+#define get_amp_offset(kc)      (((kc)->private_value >> 23) & 0x3f)
 
 /*
  * CEA Short Audio Descriptor data
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 144b85276d5a..93d7499350c6 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -399,8 +399,10 @@ static void print_conn_list(struct snd_info_buffer *buffer,
 {
         int c, curr = -1;
 
-        if (conn_len > 1 && wid_type != AC_WID_AUD_MIX &&
-            wid_type != AC_WID_VOL_KNB)
+        if (conn_len > 1 &&
+            wid_type != AC_WID_AUD_MIX &&
+            wid_type != AC_WID_VOL_KNB &&
+            wid_type != AC_WID_POWER)
                 curr = snd_hda_codec_read(codec, nid, 0,
                                           AC_VERB_GET_CONNECT_SEL, 0);
         snd_iprintf(buffer, "  Connection: %d\n", conn_len);
@@ -467,8 +469,9 @@ static void print_codec_info(struct snd_info_entry *entry,
         snd_iprintf(buffer, "Codec: %s\n",
                     codec->name ? codec->name : "Not Set");
         snd_iprintf(buffer, "Address: %d\n", codec->addr);
-        snd_iprintf(buffer, "Vendor Id: 0x%x\n", codec->vendor_id);
-        snd_iprintf(buffer, "Subsystem Id: 0x%x\n", codec->subsystem_id);
+        snd_iprintf(buffer, "Function Id: 0x%x\n", codec->function_id);
+        snd_iprintf(buffer, "Vendor Id: 0x%08x\n", codec->vendor_id);
+        snd_iprintf(buffer, "Subsystem Id: 0x%08x\n", codec->subsystem_id);
         snd_iprintf(buffer, "Revision Id: 0x%x\n", codec->revision_id);
 
         if (codec->mfg)
@@ -554,8 +557,14 @@ static void print_codec_info(struct snd_info_entry *entry,
                         snd_iprintf(buffer, "  Amp-Out caps: ");
                         print_amp_caps(buffer, codec, nid, HDA_OUTPUT);
                         snd_iprintf(buffer, "  Amp-Out vals: ");
-                        print_amp_vals(buffer, codec, nid, HDA_OUTPUT,
-                                       wid_caps & AC_WCAP_STEREO, 1);
+                        if (wid_type == AC_WID_PIN &&
+                            codec->pin_amp_workaround)
+                                print_amp_vals(buffer, codec, nid, HDA_OUTPUT,
+                                               wid_caps & AC_WCAP_STEREO,
+                                               conn_len);
+                        else
+                                print_amp_vals(buffer, codec, nid, HDA_OUTPUT,
+                                               wid_caps & AC_WCAP_STEREO, 1);
                 }
 
                 switch (wid_type) {
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index e48612323aa0..5bb48ee8b6c6 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -27,11 +27,12 @@
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_beep.h"
 
 struct ad198x_spec {
         struct snd_kcontrol_new *mixers[5];
         int num_mixers;
-
+        unsigned int beep_amp;  /* beep amp value, set via set_beep_amp() */
         const struct hda_verb *init_verbs[5];   /* initialization verbs
                                                  * don't forget NULL termination!
                                                  */
@@ -154,6 +155,16 @@ static const char *ad_slave_sws[] = {
 
 static void ad198x_free_kctls(struct hda_codec *codec);
 
+/* 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),
+        { } /* end */
+};
+
+#define set_beep_amp(spec, nid, idx, dir) \
+        ((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir)) /* mono */
+
 static int ad198x_build_controls(struct hda_codec *codec)
 {
         struct ad198x_spec *spec = codec->spec;
@@ -181,6 +192,21 @@ static int ad198x_build_controls(struct hda_codec *codec)
                         return err;
         }
 
+        /* create beep controls if needed */
+        if (spec->beep_amp) {
+                struct snd_kcontrol_new *knew;
+                for (knew = ad_beep_mixer; knew->name; knew++) {
+                        struct snd_kcontrol *kctl;
+                        kctl = snd_ctl_new1(knew, codec);
+                        if (!kctl)
+                                return -ENOMEM;
+                        kctl->private_value = spec->beep_amp;
+                        err = snd_hda_ctl_add(codec, kctl);
+                        if (err < 0)
+                                return err;
+                }
+        }
+
         /* if we have no master control, let's create it */
         if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
                 unsigned int vmaster_tlv[4];
@@ -406,7 +432,8 @@ static void ad198x_free(struct hda_codec *codec)
                 return;
 
         ad198x_free_kctls(codec);
-        kfree(codec->spec);
+        kfree(spec);
+        snd_hda_detach_beep_device(codec);
 }
 
 static struct hda_codec_ops ad198x_patch_ops = {
@@ -545,8 +572,6 @@ static struct snd_kcontrol_new ad1986a_mixers[] = {
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x18, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x18, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mono Playback Volume", 0x1e, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Mono Playback Switch", 0x1e, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
@@ -610,8 +635,7 @@ static struct snd_kcontrol_new ad1986a_laptop_mixers[] = {
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),
-        /* HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x18, 0x0, HDA_OUTPUT),
-           HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x18, 0x0, HDA_OUTPUT),
+        /* 
            HDA_CODEC_VOLUME("Mono Playback Volume", 0x1e, 0x0, HDA_OUTPUT),
            HDA_CODEC_MUTE("Mono Playback Switch", 0x1e, 0x0, HDA_OUTPUT), */
         HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
@@ -809,8 +833,6 @@ static struct snd_kcontrol_new ad1986a_laptop_automute_mixers[] = {
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x18, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x18, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),
         {
@@ -1002,10 +1024,8 @@ static struct snd_pci_quirk ad1986a_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba", AD1986A_LAPTOP_EAPD),
         SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),
         SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),
-        SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_SAMSUNG),
-        SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_SAMSUNG),
-        SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_SAMSUNG),
         SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),
+        SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc000, "Samsung", AD1986A_SAMSUNG),
         SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
         SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP),
         SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK),
@@ -1027,15 +1047,14 @@ static struct hda_amp_list ad1986a_loopbacks[] = {
 
 static int is_jack_available(struct hda_codec *codec, hda_nid_t nid)
 {
-        unsigned int conf = snd_hda_codec_read(codec, nid, 0,
-                                               AC_VERB_GET_CONFIG_DEFAULT, 0);
+        unsigned int conf = snd_hda_codec_get_pincfg(codec, nid);
         return get_defcfg_connect(conf) != AC_JACK_PORT_NONE;
 }
 
 static int patch_ad1986a(struct hda_codec *codec)
 {
         struct ad198x_spec *spec;
-        int board_config;
+        int err, board_config;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -1043,6 +1062,13 @@ static int patch_ad1986a(struct hda_codec *codec)
 
         codec->spec = spec;
 
+        err = snd_hda_attach_beep_device(codec, 0x19);
+        if (err < 0) {
+                ad198x_free(codec);
+                return err;
+        }
+        set_beep_amp(spec, 0x18, 0, HDA_OUTPUT);
+
         spec->multiout.max_channels = 6;
         spec->multiout.num_dacs = ARRAY_SIZE(ad1986a_dac_nids);
         spec->multiout.dac_nids = ad1986a_dac_nids;
@@ -1222,8 +1248,6 @@ static struct snd_kcontrol_new ad1983_mixers[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x13, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME_MONO("PC Speaker Playback Volume", 0x10, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("PC Speaker Playback Switch", 0x10, 1, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
@@ -1294,6 +1318,7 @@ static struct hda_amp_list ad1983_loopbacks[] = {
 static int patch_ad1983(struct hda_codec *codec)
 {
         struct ad198x_spec *spec;
+        int err;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -1301,6 +1326,13 @@ static int patch_ad1983(struct hda_codec *codec)
 
         codec->spec = spec;
 
+        err = snd_hda_attach_beep_device(codec, 0x10);
+        if (err < 0) {
+                ad198x_free(codec);
+                return err;
+        }
+        set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
+
         spec->multiout.max_channels = 2;
         spec->multiout.num_dacs = ARRAY_SIZE(ad1983_dac_nids);
         spec->multiout.dac_nids = ad1983_dac_nids;
@@ -1370,8 +1402,6 @@ static struct snd_kcontrol_new ad1981_mixers[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x1c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME_MONO("PC Speaker Playback Volume", 0x0d, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("PC Speaker Playback Switch", 0x0d, 1, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x08, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
@@ -1416,8 +1446,8 @@ static struct hda_verb ad1981_init_verbs[] = {
         {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
         {0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
         /* Mic boost: 0dB */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* Record selector: Front mic */
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x0},
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
@@ -1682,10 +1712,10 @@ static struct snd_pci_quirk ad1981_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1014, 0x0597, "Lenovo Z60", AD1981_THINKPAD),
         SND_PCI_QUIRK(0x1014, 0x05b7, "Lenovo Z60m", AD1981_THINKPAD),
         /* All HP models */
-        SND_PCI_QUIRK(0x103c, 0, "HP nx", AD1981_HP),
+        SND_PCI_QUIRK_VENDOR(0x103c, "HP nx", AD1981_HP),
         SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba U205", AD1981_TOSHIBA),
         /* Lenovo Thinkpad T60/X60/Z6xx */
-        SND_PCI_QUIRK(0x17aa, 0, "Lenovo Thinkpad", AD1981_THINKPAD),
+        SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1981_THINKPAD),
         /* HP nx6320 (reversed SSID, H/W bug) */
         SND_PCI_QUIRK(0x30b0, 0x103c, "HP nx6320", AD1981_HP),
         {}
@@ -1694,7 +1724,7 @@ static struct snd_pci_quirk ad1981_cfg_tbl[] = {
 static int patch_ad1981(struct hda_codec *codec)
 {
         struct ad198x_spec *spec;
-        int board_config;
+        int err, board_config;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -1702,6 +1732,13 @@ static int patch_ad1981(struct hda_codec *codec)
 
         codec->spec = spec;
 
+        err = snd_hda_attach_beep_device(codec, 0x10);
+        if (err < 0) {
+                ad198x_free(codec);
+                return err;
+        }
+        set_beep_amp(spec, 0x0d, 0, HDA_OUTPUT);
+
         spec->multiout.max_channels = 2;
         spec->multiout.num_dacs = ARRAY_SIZE(ad1981_dac_nids);
         spec->multiout.dac_nids = ad1981_dac_nids;
@@ -1988,9 +2025,6 @@ static struct snd_kcontrol_new ad1988_6stack_mixers2[] = {
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x4, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x4, HDA_INPUT),
 
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x10, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x10, 0x0, HDA_OUTPUT),
-
         HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),
 
@@ -2034,9 +2068,6 @@ static struct snd_kcontrol_new ad1988_3stack_mixers2[] = {
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x4, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x4, HDA_INPUT),
 
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x10, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x10, 0x0, HDA_OUTPUT),
-
         HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),
 
@@ -2066,9 +2097,6 @@ static struct snd_kcontrol_new ad1988_laptop_mixers[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT),
 
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x10, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x10, 0x0, HDA_OUTPUT),
-
         HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),
 
@@ -2297,10 +2325,6 @@ static struct hda_verb ad1988_capture_init_verbs[] = {
         {0x0c, AC_VERB_SET_CONNECT_SEL, 0x1},
         {0x0d, AC_VERB_SET_CONNECT_SEL, 0x1},
         {0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},
-        /* ADCs; muted */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
 
         { }
 };
@@ -2408,10 +2432,6 @@ static struct hda_verb ad1988_3stack_init_verbs[] = {
         {0x0c, AC_VERB_SET_CONNECT_SEL, 0x1},
         {0x0d, AC_VERB_SET_CONNECT_SEL, 0x1},
         {0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},
-        /* ADCs; muted */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         /* Analog Mix output amp */
         {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */
         { }
@@ -2483,10 +2503,6 @@ static struct hda_verb ad1988_laptop_init_verbs[] = {
         {0x0c, AC_VERB_SET_CONNECT_SEL, 0x1},
         {0x0d, AC_VERB_SET_CONNECT_SEL, 0x1},
         {0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},
-        /* ADCs; muted */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         /* Analog Mix output amp */
         {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */
         { }
@@ -2890,7 +2906,7 @@ static int ad1988_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = AD1988_SPDIF_OUT;
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = AD1988_SPDIF_IN;
@@ -2940,7 +2956,7 @@ static struct snd_pci_quirk ad1988_cfg_tbl[] = {
 static int patch_ad1988(struct hda_codec *codec)
 {
         struct ad198x_spec *spec;
-        int board_config;
+        int err, board_config;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -2960,7 +2976,7 @@ static int patch_ad1988(struct hda_codec *codec)
 
         if (board_config == AD1988_AUTO) {
                 /* automatic parse from the BIOS config */
-                int err = ad1988_parse_auto_config(codec);
+                err = ad1988_parse_auto_config(codec);
                 if (err < 0) {
                         ad198x_free(codec);
                         return err;
@@ -2970,6 +2986,13 @@ static int patch_ad1988(struct hda_codec *codec)
                 }
         }
 
+        err = snd_hda_attach_beep_device(codec, 0x10);
+        if (err < 0) {
+                ad198x_free(codec);
+                return err;
+        }
+        set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
+
         switch (board_config) {
         case AD1988_6STACK:
         case AD1988_6STACK_DIG:
@@ -3126,12 +3149,6 @@ static struct snd_kcontrol_new ad1884_base_mixers[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x02, HDA_INPUT),
-        /*
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x20, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x20, 0x03, HDA_INPUT),
-        HDA_CODEC_VOLUME("Digital Beep Playback Volume", 0x10, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Digital Beep Playback Switch", 0x10, 0x0, HDA_OUTPUT),
-        */
         HDA_CODEC_VOLUME("Mic Boost", 0x15, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
@@ -3204,10 +3221,10 @@ static struct hda_verb ad1884_init_verbs[] = {
         {0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},
         /* Port-B (front mic) pin */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* Port-C (rear mic) pin */
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* Analog mixer; mute as default */
         {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
@@ -3240,7 +3257,7 @@ static const char *ad1884_slave_vols[] = {
         "CD Playback Volume",
         "Internal Mic Playback Volume",
         "Docking Mic Playback Volume"
-        "Beep Playback Volume",
+        /* "Beep Playback Volume", */
         "IEC958 Playback Volume",
         NULL
 };
@@ -3248,6 +3265,7 @@ static const char *ad1884_slave_vols[] = {
 static int patch_ad1884(struct hda_codec *codec)
 {
         struct ad198x_spec *spec;
+        int err;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -3255,6 +3273,13 @@ static int patch_ad1884(struct hda_codec *codec)
 
         codec->spec = spec;
 
+        err = snd_hda_attach_beep_device(codec, 0x10);
+        if (err < 0) {
+                ad198x_free(codec);
+                return err;
+        }
+        set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
+
         spec->multiout.max_channels = 2;
         spec->multiout.num_dacs = ARRAY_SIZE(ad1884_dac_nids);
         spec->multiout.dac_nids = ad1884_dac_nids;
@@ -3321,8 +3346,6 @@ static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {
         HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Internal Mic Boost", 0x15, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Docking Mic Boost", 0x25, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
@@ -3358,7 +3381,7 @@ static struct hda_verb ad1984_thinkpad_init_verbs[] = {
         {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
         {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         /* docking mic boost */
-        {0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         /* Analog mixer - docking mic; mute as default */
         {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
         /* enable EAPD bit */
@@ -3379,10 +3402,6 @@ static struct snd_kcontrol_new ad1984_dell_desktop_mixers[] = {
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
         HDA_CODEC_VOLUME("Line-In Playback Volume", 0x20, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Line-In Playback Switch", 0x20, 0x01, HDA_INPUT),
-        /*
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x20, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x20, 0x03, HDA_INPUT),
-        */
         HDA_CODEC_VOLUME("Line-In Boost", 0x15, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
@@ -3468,7 +3487,7 @@ static const char *ad1984_models[AD1984_MODELS] = {
 
 static struct snd_pci_quirk ad1984_cfg_tbl[] = {
         /* Lenovo Thinkpad T61/X61 */
-        SND_PCI_QUIRK(0x17aa, 0, "Lenovo Thinkpad", AD1984_THINKPAD),
+        SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1984_THINKPAD),
         SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP),
         {}
 };
@@ -3561,8 +3580,6 @@ static struct snd_kcontrol_new ad1884a_base_mixers[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Boost", 0x15, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x25, 0x0, HDA_OUTPUT),
@@ -3622,10 +3639,10 @@ static struct hda_verb ad1884a_init_verbs[] = {
         {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         /* Port-B (front mic) pin */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* Port-C (rear line-in) pin */
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* Port-E (rear mic) pin */
         {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
         {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
@@ -3695,8 +3712,6 @@ static struct snd_kcontrol_new ad1884a_laptop_mixers[] = {
         HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x20, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x20, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x20, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Internal Mic Boost", 0x15, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Dock Mic Boost", 0x25, 0x0, HDA_OUTPUT),
@@ -3724,8 +3739,6 @@ static struct snd_kcontrol_new ad1884a_mobile_mixers[] = {
         HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
         HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Capture Volume", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Internal Mic Capture Volume", 0x15, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
@@ -3836,8 +3849,6 @@ static struct snd_kcontrol_new ad1984a_thinkpad_mixers[] = {
         HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Internal Mic Boost", 0x17, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
@@ -3911,9 +3922,9 @@ static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
         SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP),
         SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),
-        SND_PCI_QUIRK(0x103c, 0x30e6, "HP 6730b", AD1884A_LAPTOP),
-        SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP),
-        SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP),
+        SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x3070, "HP", AD1884A_MOBILE),
+        SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30e0, "HP laptop", AD1884A_LAPTOP),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3600, "HP laptop", AD1884A_LAPTOP),
         SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
         {}
 };
@@ -3921,7 +3932,7 @@ static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
 static int patch_ad1884a(struct hda_codec *codec)
 {
         struct ad198x_spec *spec;
-        int board_config;
+        int err, board_config;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -3929,6 +3940,13 @@ static int patch_ad1884a(struct hda_codec *codec)
 
         codec->spec = spec;
 
+        err = snd_hda_attach_beep_device(codec, 0x10);
+        if (err < 0) {
+                ad198x_free(codec);
+                return err;
+        }
+        set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
+
         spec->multiout.max_channels = 2;
         spec->multiout.num_dacs = ARRAY_SIZE(ad1884a_dac_nids);
         spec->multiout.dac_nids = ad1884a_dac_nids;
@@ -3966,6 +3984,14 @@ static int patch_ad1884a(struct hda_codec *codec)
                 spec->multiout.dig_out_nid = 0;
                 codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;
                 codec->patch_ops.init = ad1884a_hp_init;
+                /* set the upper-limit for mixer amp to 0dB for avoiding the
+                 * possible damage by overloading
+                 */
+                snd_hda_override_amp_caps(codec, 0x20, 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 AD1884A_THINKPAD:
                 spec->mixers[0] = ad1984a_thinkpad_mixers;
@@ -4083,8 +4109,6 @@ static struct snd_kcontrol_new ad1882_loopback_mixers[] = {
         HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x06, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x06, HDA_INPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x07, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x07, HDA_INPUT),
         { } /* end */
 };
 
@@ -4097,8 +4121,6 @@ static struct snd_kcontrol_new ad1882a_loopback_mixers[] = {
         HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x06, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x06, HDA_INPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x07, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x07, HDA_INPUT),
         HDA_CODEC_VOLUME("Digital Mic Boost", 0x1f, 0x0, HDA_INPUT),
         { } /* end */
 };
@@ -4257,7 +4279,7 @@ static const char *ad1882_models[AD1986A_MODELS] = {
 static int patch_ad1882(struct hda_codec *codec)
 {
         struct ad198x_spec *spec;
-        int board_config;
+        int err, board_config;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -4265,6 +4287,13 @@ static int patch_ad1882(struct hda_codec *codec)
 
         codec->spec = spec;
 
+        err = snd_hda_attach_beep_device(codec, 0x10);
+        if (err < 0) {
+                ad198x_free(codec);
+                return err;
+        }
+        set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
+
         spec->multiout.max_channels = 6;
         spec->multiout.num_dacs = 3;
         spec->multiout.dac_nids = ad1882_dac_nids;
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
index f3ebe837f2d5..c921264bbd71 100644
--- a/sound/pci/hda/patch_cmedia.c
+++ b/sound/pci/hda/patch_cmedia.c
@@ -680,13 +680,13 @@ static int patch_cmi9880(struct hda_codec *codec)
                 struct auto_pin_cfg cfg;
 
                 /* collect pin default configuration */
-                port_e = snd_hda_codec_read(codec, 0x0f, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
-                port_f = snd_hda_codec_read(codec, 0x10, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                port_e = snd_hda_codec_get_pincfg(codec, 0x0f);
+                port_f = snd_hda_codec_get_pincfg(codec, 0x10);
                 spec->front_panel = 1;
                 if (get_defcfg_connect(port_e) == AC_JACK_PORT_NONE ||
                     get_defcfg_connect(port_f) == AC_JACK_PORT_NONE) {
-                        port_g = snd_hda_codec_read(codec, 0x1f, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
-                        port_h = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        port_g = snd_hda_codec_get_pincfg(codec, 0x1f);
+                        port_h = snd_hda_codec_get_pincfg(codec, 0x20);
                         spec->channel_modes = cmi9880_channel_modes;
                         /* no front panel */
                         if (get_defcfg_connect(port_g) == AC_JACK_PORT_NONE ||
@@ -703,8 +703,8 @@ static int patch_cmi9880(struct hda_codec *codec)
                         spec->multiout.max_channels = cmi9880_channel_modes[0].channels;
                 } else {
                         spec->input_mux = &cmi9880_basic_mux;
-                        port_spdifi = snd_hda_codec_read(codec, 0x13, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
-                        port_spdifo = snd_hda_codec_read(codec, 0x12, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        port_spdifi = snd_hda_codec_get_pincfg(codec, 0x13);
+                        port_spdifo = snd_hda_codec_get_pincfg(codec, 0x12);
                         if (get_defcfg_connect(port_spdifo) != AC_JACK_PORT_NONE)
                                 spec->multiout.dig_out_nid = CMI_DIG_OUT_NID;
                         if (get_defcfg_connect(port_spdifi) != AC_JACK_PORT_NONE)
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 0177ef8f4c9e..1f2ad76ca94b 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -58,6 +58,7 @@ struct conexant_spec {
 
         struct snd_kcontrol_new *mixers[5];
         int num_mixers;
+        hda_nid_t vmaster_nid;
 
         const struct hda_verb *init_verbs[5];   /* initialization verbs
                                                  * don't forget NULL
@@ -72,6 +73,7 @@ struct conexant_spec {
                                          */
         unsigned int cur_eapd;
         unsigned int hp_present;
+        unsigned int no_auto_mic;
         unsigned int need_dac_fix;
 
         /* capture */
@@ -461,6 +463,29 @@ static void conexant_free(struct hda_codec *codec)
         kfree(codec->spec);
 }
 
+static struct snd_kcontrol_new cxt_capture_mixers[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .info = conexant_mux_enum_info,
+                .get = conexant_mux_enum_get,
+                .put = conexant_mux_enum_put
+        },
+        {}
+};
+
+static const char *slave_vols[] = {
+        "Headphone Playback Volume",
+        "Speaker Playback Volume",
+        NULL
+};
+
+static const char *slave_sws[] = {
+        "Headphone Playback Switch",
+        "Speaker Playback Switch",
+        NULL
+};
+
 static int conexant_build_controls(struct hda_codec *codec)
 {
         struct conexant_spec *spec = codec->spec;
@@ -488,6 +513,32 @@ static int conexant_build_controls(struct hda_codec *codec)
                 if (err < 0)
                         return err;
         }
+
+        /* if we have no master control, let's create it */
+        if (spec->vmaster_nid &&
+            !snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
+                unsigned int vmaster_tlv[4];
+                snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid,
+                                        HDA_OUTPUT, vmaster_tlv);
+                err = snd_hda_add_vmaster(codec, "Master Playback Volume",
+                                          vmaster_tlv, slave_vols);
+                if (err < 0)
+                        return err;
+        }
+        if (spec->vmaster_nid &&
+            !snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {
+                err = snd_hda_add_vmaster(codec, "Master Playback Switch",
+                                          NULL, slave_sws);
+                if (err < 0)
+                        return err;
+        }
+
+        if (spec->input_mux) {
+                err = snd_hda_add_new_ctls(codec, cxt_capture_mixers);
+                if (err < 0)
+                        return err;
+        }
+
         return 0;
 }
 
@@ -719,13 +770,6 @@ static void cxt5045_hp_unsol_event(struct hda_codec *codec,
 }
 
 static struct snd_kcontrol_new cxt5045_mixers[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Capture Source",
-                .info = conexant_mux_enum_info,
-                .get = conexant_mux_enum_get,
-                .put = conexant_mux_enum_put
-        },
         HDA_CODEC_VOLUME("Int Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Int Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),
@@ -759,13 +803,6 @@ static struct snd_kcontrol_new cxt5045_benq_mixers[] = {
 };
 
 static struct snd_kcontrol_new cxt5045_mixers_hp530[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Capture Source",
-                .info = conexant_mux_enum_info,
-                .get = conexant_mux_enum_get,
-                .put = conexant_mux_enum_put
-        },
         HDA_CODEC_VOLUME("Int Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Int Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),
@@ -1002,15 +1039,9 @@ static const char *cxt5045_models[CXT5045_MODELS] = {
 };
 
 static struct snd_pci_quirk cxt5045_cfg_tbl[] = {
-        SND_PCI_QUIRK(0x103c, 0x30a5, "HP", CXT5045_LAPTOP_HPSENSE),
-        SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV Series", CXT5045_LAPTOP_HPSENSE),
-        SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2120", CXT5045_LAPTOP_HPSENSE),
-        SND_PCI_QUIRK(0x103c, 0x30b7, "HP DV6000Z", CXT5045_LAPTOP_HPSENSE),
-        SND_PCI_QUIRK(0x103c, 0x30bb, "HP DV8000", CXT5045_LAPTOP_HPSENSE),
-        SND_PCI_QUIRK(0x103c, 0x30cd, "HP DV Series", CXT5045_LAPTOP_HPSENSE),
-        SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV9533EG", CXT5045_LAPTOP_HPSENSE),
         SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT5045_LAPTOP_HP530),
-        SND_PCI_QUIRK(0x103c, 0x30d9, "HP Spartan", CXT5045_LAPTOP_HPSENSE),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP DV Series",
+                           CXT5045_LAPTOP_HPSENSE),
         SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P105", CXT5045_LAPTOP_MICSENSE),
         SND_PCI_QUIRK(0x152d, 0x0753, "Benq R55E", CXT5045_BENQ),
         SND_PCI_QUIRK(0x1734, 0x10ad, "Fujitsu Si1520", CXT5045_LAPTOP_MICSENSE),
@@ -1020,8 +1051,8 @@ static struct snd_pci_quirk cxt5045_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1509, 0x1e40, "FIC", CXT5045_LAPTOP_HPMICSENSE),
         SND_PCI_QUIRK(0x1509, 0x2f05, "FIC", CXT5045_LAPTOP_HPMICSENSE),
         SND_PCI_QUIRK(0x1509, 0x2f06, "FIC", CXT5045_LAPTOP_HPMICSENSE),
-        SND_PCI_QUIRK(0x1631, 0xc106, "Packard Bell", CXT5045_LAPTOP_HPMICSENSE),
-        SND_PCI_QUIRK(0x1631, 0xc107, "Packard Bell", CXT5045_LAPTOP_HPMICSENSE),
+        SND_PCI_QUIRK_MASK(0x1631, 0xff00, 0xc100, "Packard Bell",
+                           CXT5045_LAPTOP_HPMICSENSE),
         SND_PCI_QUIRK(0x8086, 0x2111, "Conexant Reference board", CXT5045_LAPTOP_HPSENSE),
         {}
 };
@@ -1035,6 +1066,7 @@ static int patch_cxt5045(struct hda_codec *codec)
         if (!spec)
                 return -ENOMEM;
         codec->spec = spec;
+        codec->pin_amp_workaround = 1;
 
         spec->multiout.max_channels = 2;
         spec->multiout.num_dacs = ARRAY_SIZE(cxt5045_dac_nids);
@@ -1134,7 +1166,7 @@ static int patch_cxt5045(struct hda_codec *codec)
 /* Conexant 5047 specific */
 #define CXT5047_SPDIF_OUT       0x11
 
-static hda_nid_t cxt5047_dac_nids[2] = { 0x10, 0x1c };
+static hda_nid_t cxt5047_dac_nids[1] = { 0x10 }; /* 0x1c */
 static hda_nid_t cxt5047_adc_nids[1] = { 0x12 };
 static hda_nid_t cxt5047_capsrc_nids[1] = { 0x1a };
 
@@ -1142,20 +1174,6 @@ static struct hda_channel_mode cxt5047_modes[1] = {
         { 2, NULL },
 };
 
-static struct hda_input_mux cxt5047_capture_source = {
-        .num_items = 1,
-        .items = {
-                { "Mic", 0x2 },
-        }
-};
-
-static struct hda_input_mux cxt5047_hp_capture_source = {
-        .num_items = 1,
-        .items = {
-                { "ExtMic", 0x2 },
-        }
-};
-
 static struct hda_input_mux cxt5047_toshiba_capture_source = {
         .num_items = 2,
         .items = {
@@ -1179,7 +1197,11 @@ static int cxt5047_hp_master_sw_put(struct snd_kcontrol *kcontrol,
          * the headphone jack
          */
         bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE;
-        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
+        /* NOTE: Conexat codec needs the index for *OUTPUT* amp of
+         * pin widgets unlike other codecs.  In this case, we need to
+         * set index 0x01 for the volume from the mixer amp 0x19.
+         */
+        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0x01,
                                  HDA_AMP_MUTE, bits);
         bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE;
         snd_hda_codec_amp_stereo(codec, 0x13, HDA_OUTPUT, 0,
@@ -1187,16 +1209,6 @@ static int cxt5047_hp_master_sw_put(struct snd_kcontrol *kcontrol,
         return 1;
 }
 
-/* bind volumes of both NID 0x13 (Headphones) and 0x1d (Speakers) */
-static struct hda_bind_ctls cxt5047_bind_master_vol = {
-        .ops = &snd_hda_bind_vol,
-        .values = {
-                HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
-                HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),
-                0
-        },
-};
-
 /* mute internal speaker if HP is plugged */
 static void cxt5047_hp_automute(struct hda_codec *codec)
 {
@@ -1207,27 +1219,8 @@ static void cxt5047_hp_automute(struct hda_codec *codec)
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
 
         bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        /* Mute/Unmute PCM 2 for good measure - some systems need this */
-        snd_hda_codec_amp_stereo(codec, 0x1c, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-}
-
-/* mute internal speaker if HP is plugged */
-static void cxt5047_hp2_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;
-
-        bits = spec->hp_present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        /* Mute/Unmute PCM 2 for good measure - some systems need this */
-        snd_hda_codec_amp_stereo(codec, 0x1c, HDA_OUTPUT, 0,
+        /* See the note in cxt5047_hp_master_sw_put */
+        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0x01,
                                  HDA_AMP_MUTE, bits);
 }
 
@@ -1268,55 +1261,14 @@ static void cxt5047_hp_unsol_event(struct hda_codec *codec,
         }
 }
 
-/* unsolicited event for HP jack sensing - non-EAPD systems */
-static void cxt5047_hp2_unsol_event(struct hda_codec *codec,
-                                  unsigned int res)
-{
-        res >>= 26;
-        switch (res) {
-        case CONEXANT_HP_EVENT:
-                cxt5047_hp2_automute(codec);
-                break;
-        case CONEXANT_MIC_EVENT:
-                cxt5047_hp_automic(codec);
-                break;
-        }
-}
-
-static struct snd_kcontrol_new cxt5047_mixers[] = {
-        HDA_CODEC_VOLUME("Mic Bypass Capture Volume", 0x19, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Bypass Capture Switch", 0x19, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Gain Volume", 0x1a, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Mic Gain Switch", 0x1a, 0x0, HDA_OUTPUT),
+static struct snd_kcontrol_new cxt5047_base_mixers[] = {
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x19, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x19, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x1a, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x03, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT),
         HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("PCM-2 Volume", 0x1c, 0x00, HDA_OUTPUT),
-        HDA_CODEC_MUTE("PCM-2 Switch", 0x1c, 0x00, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x00, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Speaker Playback Switch", 0x1d, 0x00, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x13, 0x00, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x13, 0x00, HDA_OUTPUT),
-
-        {}
-};
-
-static struct snd_kcontrol_new cxt5047_toshiba_mixers[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Capture Source",
-                .info = conexant_mux_enum_info,
-                .get = conexant_mux_enum_get,
-                .put = conexant_mux_enum_put
-        },
-        HDA_CODEC_VOLUME("Mic Bypass Capture Volume", 0x19, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Bypass Capture Switch", 0x19, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT),
-        HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT),
-        HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),
-        HDA_BIND_VOL("Master Playback Volume", &cxt5047_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
@@ -1329,29 +1281,15 @@ static struct snd_kcontrol_new cxt5047_toshiba_mixers[] = {
         {}
 };
 
-static struct snd_kcontrol_new cxt5047_hp_mixers[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Capture Source",
-                .info = conexant_mux_enum_info,
-                .get = conexant_mux_enum_get,
-                .put = conexant_mux_enum_put
-        },
-        HDA_CODEC_VOLUME("Mic Bypass Capture Volume", 0x19, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Bypass Capture Switch", 0x19,0x02,HDA_INPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT),
-        HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT),
-        HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),
+static struct snd_kcontrol_new cxt5047_hp_spk_mixers[] = {
+        /* See the note in cxt5047_hp_master_sw_put */
+        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x01, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x13, 0x00, HDA_OUTPUT),
+        {}
+};
+
+static struct snd_kcontrol_new cxt5047_hp_only_mixers[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x13, 0x00, HDA_OUTPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Switch",
-                .info = cxt_eapd_info,
-                .get = cxt_eapd_get,
-                .put = cxt5047_hp_master_sw_put,
-                .private_value = 0x13,
-        },
         { } /* end */
 };
 
@@ -1362,8 +1300,8 @@ static struct hda_verb cxt5047_init_verbs[] = {
         {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },
         /* HP, Speaker  */
         {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
-        {0x13, AC_VERB_SET_CONNECT_SEL,0x1},
-        {0x1d, AC_VERB_SET_CONNECT_SEL,0x0},
+        {0x13, AC_VERB_SET_CONNECT_SEL, 0x0}, /* mixer(0x19) */
+        {0x1d, AC_VERB_SET_CONNECT_SEL, 0x1}, /* mixer(0x19) */
         /* Record selector: Mic */
         {0x12, AC_VERB_SET_CONNECT_SEL,0x03},
         {0x19, AC_VERB_SET_AMP_GAIN_MUTE,
@@ -1383,30 +1321,7 @@ static struct hda_verb cxt5047_init_verbs[] = {
 
 /* configuration for Toshiba Laptops */
 static struct hda_verb cxt5047_toshiba_init_verbs[] = {
-        {0x13, AC_VERB_SET_EAPD_BTLENABLE, 0x0 }, /* default on */
-        /* pin sensing on HP and Mic jacks */
-        {0x13, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
-        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},
-        /* Speaker routing */
-        {0x1d, AC_VERB_SET_CONNECT_SEL,0x1},
-        {}
-};
-
-/* configuration for HP Laptops */
-static struct hda_verb cxt5047_hp_init_verbs[] = {
-        /* pin sensing on HP jack */
-        {0x13, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
-        /* 0x13 is actually shared by both HP and speaker;
-         * setting the connection to 0 (=0x19) makes the master volume control
-         * working mysteriouslly...
-         */
-        {0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
-        /* Record selector: Ext Mic */
-        {0x12, AC_VERB_SET_CONNECT_SEL,0x03},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE,
-         AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
-        /* Speaker routing */
-        {0x1d, AC_VERB_SET_CONNECT_SEL,0x1},
+        {0x13, AC_VERB_SET_EAPD_BTLENABLE, 0x0}, /* default off */
         {}
 };
 
@@ -1571,11 +1486,9 @@ static const char *cxt5047_models[CXT5047_MODELS] = {
 };
 
 static struct snd_pci_quirk cxt5047_cfg_tbl[] = {
-        SND_PCI_QUIRK(0x103c, 0x30a0, "HP DV1000", CXT5047_LAPTOP),
         SND_PCI_QUIRK(0x103c, 0x30a5, "HP DV5200T/DV8000T", CXT5047_LAPTOP_HP),
-        SND_PCI_QUIRK(0x103c, 0x30b2, "HP DV2000T/DV3000T", CXT5047_LAPTOP),
-        SND_PCI_QUIRK(0x103c, 0x30b5, "HP DV2000Z", CXT5047_LAPTOP),
-        SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6700", CXT5047_LAPTOP),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP DV Series",
+                           CXT5047_LAPTOP),
         SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P100", CXT5047_LAPTOP_EAPD),
         {}
 };
@@ -1589,6 +1502,7 @@ static int patch_cxt5047(struct hda_codec *codec)
         if (!spec)
                 return -ENOMEM;
         codec->spec = spec;
+        codec->pin_amp_workaround = 1;
 
         spec->multiout.max_channels = 2;
         spec->multiout.num_dacs = ARRAY_SIZE(cxt5047_dac_nids);
@@ -1597,9 +1511,8 @@ static int patch_cxt5047(struct hda_codec *codec)
         spec->num_adc_nids = 1;
         spec->adc_nids = cxt5047_adc_nids;
         spec->capsrc_nids = cxt5047_capsrc_nids;
-        spec->input_mux = &cxt5047_capture_source;
         spec->num_mixers = 1;
-        spec->mixers[0] = cxt5047_mixers;
+        spec->mixers[0] = cxt5047_base_mixers;
         spec->num_init_verbs = 1;
         spec->init_verbs[0] = cxt5047_init_verbs;
         spec->spdif_route = 0;
@@ -1613,21 +1526,22 @@ static int patch_cxt5047(struct hda_codec *codec)
                                                   cxt5047_cfg_tbl);
         switch (board_config) {
         case CXT5047_LAPTOP:
-                codec->patch_ops.unsol_event = cxt5047_hp2_unsol_event;
+                spec->num_mixers = 2;
+                spec->mixers[1] = cxt5047_hp_spk_mixers;
+                codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
                 break;
         case CXT5047_LAPTOP_HP:
-                spec->input_mux = &cxt5047_hp_capture_source;
-                spec->num_init_verbs = 2;
-                spec->init_verbs[1] = cxt5047_hp_init_verbs;
-                spec->mixers[0] = cxt5047_hp_mixers;
+                spec->num_mixers = 2;
+                spec->mixers[1] = cxt5047_hp_only_mixers;
                 codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
                 codec->patch_ops.init = cxt5047_hp_init;
                 break;
         case CXT5047_LAPTOP_EAPD:
                 spec->input_mux = &cxt5047_toshiba_capture_source;
+                spec->num_mixers = 2;
+                spec->mixers[1] = cxt5047_hp_spk_mixers;
                 spec->num_init_verbs = 2;
                 spec->init_verbs[1] = cxt5047_toshiba_init_verbs;
-                spec->mixers[0] = cxt5047_toshiba_mixers;
                 codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
                 break;
 #ifdef CONFIG_SND_DEBUG
@@ -1638,6 +1552,7 @@ static int patch_cxt5047(struct hda_codec *codec)
                 codec->patch_ops.unsol_event = cxt5047_hp_unsol_event;
 #endif  
         }
+        spec->vmaster_nid = 0x13;
         return 0;
 }
 
@@ -1673,8 +1588,11 @@ static int cxt5051_hp_master_sw_put(struct snd_kcontrol *kcontrol,
 /* toggle input of built-in and mic jack appropriately */
 static void cxt5051_portb_automic(struct hda_codec *codec)
 {
+        struct conexant_spec *spec = codec->spec;
         unsigned int present;
 
+        if (spec->no_auto_mic)
+                return;
         present = snd_hda_codec_read(codec, 0x17, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) &
                 AC_PINSENSE_PRESENCE;
@@ -1690,6 +1608,8 @@ static void cxt5051_portc_automic(struct hda_codec *codec)
         unsigned int present;
         hda_nid_t new_adc;
 
+        if (spec->no_auto_mic)
+                return;
         present = snd_hda_codec_read(codec, 0x18, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) &
                 AC_PINSENSE_PRESENCE;
@@ -1776,6 +1696,22 @@ static struct snd_kcontrol_new cxt5051_hp_mixers[] = {
         {}
 };
 
+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,
+        },
+
+        {}
+};
+
 static struct hda_verb cxt5051_init_verbs[] = {
         /* Line in, Mic */
         {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
@@ -1806,6 +1742,66 @@ static struct hda_verb cxt5051_init_verbs[] = {
         { } /* end */
 };
 
+static struct hda_verb cxt5051_hp_dv6736_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},
+        {0x17, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CXT5051_PORTB_EVENT},
+        { } /* end */
+};
+
+static struct hda_verb cxt5051_lenovo_x200_init_verbs[] = {
+        /* Line in, Mic */
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
+        /* SPK  */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* HP, Amp  */
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x16, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* Docking HP */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x19, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* DAC1 */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Record selector: Int mic */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},
+        /* SPDIF route: PCM */
+        {0x1c, AC_VERB_SET_CONNECT_SEL, 0x0},
+        /* EAPD */
+        {0x1a, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
+        {0x16, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},
+        {0x17, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CXT5051_PORTB_EVENT},
+        {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CXT5051_PORTC_EVENT},
+        {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},
+        { } /* end */
+};
+
 /* initialize jack-sensing, too */
 static int cxt5051_init(struct hda_codec *codec)
 {
@@ -1823,18 +1819,24 @@ static int cxt5051_init(struct hda_codec *codec)
 enum {
         CXT5051_LAPTOP,  /* Laptops w/ EAPD support */
         CXT5051_HP,     /* no docking */
+        CXT5051_HP_DV6736,      /* HP without mic switch */
+        CXT5051_LENOVO_X200,    /* Lenovo X200 laptop */
         CXT5051_MODELS
 };
 
 static const char *cxt5051_models[CXT5051_MODELS] = {
         [CXT5051_LAPTOP]        = "laptop",
         [CXT5051_HP]            = "hp",
+        [CXT5051_HP_DV6736]     = "hp-dv6736",
+        [CXT5051_LENOVO_X200]   = "lenovo-x200",
 };
 
 static struct snd_pci_quirk cxt5051_cfg_tbl[] = {
+        SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6736", CXT5051_HP_DV6736),
         SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",
                       CXT5051_LAPTOP),
         SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP),
+        SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT5051_LENOVO_X200),
         {}
 };
 
@@ -1847,6 +1849,7 @@ static int patch_cxt5051(struct hda_codec *codec)
         if (!spec)
                 return -ENOMEM;
         codec->spec = spec;
+        codec->pin_amp_workaround = 1;
 
         codec->patch_ops = conexant_patch_ops;
         codec->patch_ops.init = cxt5051_init;
@@ -1867,17 +1870,22 @@ static int patch_cxt5051(struct hda_codec *codec)
         spec->cur_adc = 0;
         spec->cur_adc_idx = 0;
 
+        codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;
+
         board_config = snd_hda_check_board_config(codec, CXT5051_MODELS,
                                                   cxt5051_models,
                                                   cxt5051_cfg_tbl);
         switch (board_config) {
         case CXT5051_HP:
-                codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;
                 spec->mixers[0] = cxt5051_hp_mixers;
                 break;
-        default:
-        case CXT5051_LAPTOP:
-                codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;
+        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;
+                break;
+        case CXT5051_LENOVO_X200:
+                spec->init_verbs[0] = cxt5051_lenovo_x200_init_verbs;
                 break;
         }
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 6c26afcb8262..82097790f6f3 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -30,6 +30,7 @@
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_beep.h"
 
 #define ALC880_FRONT_EVENT              0x01
 #define ALC880_DCVOL_EVENT              0x02
@@ -77,6 +78,7 @@ enum {
         ALC260_ACER,
         ALC260_WILL,
         ALC260_REPLACER_672V,
+        ALC260_FAVORIT100,
 #ifdef CONFIG_SND_DEBUG
         ALC260_TEST,
 #endif
@@ -103,6 +105,7 @@ enum {
         ALC262_NEC,
         ALC262_TOSHIBA_S06,
         ALC262_TOSHIBA_RX1,
+        ALC262_TYAN,
         ALC262_AUTO,
         ALC262_MODEL_LAST /* last tag */
 };
@@ -238,6 +241,13 @@ enum {
         ALC883_MODEL_LAST,
 };
 
+/* styles of capture selection */
+enum {
+        CAPT_MUX = 0,   /* only mux based */
+        CAPT_MIX,       /* only mixer based */
+        CAPT_1MUX_MIX,  /* first mux and other mixers */
+};
+
 /* for GPIO Poll */
 #define GPIO_MASK       0x03
 
@@ -246,6 +256,7 @@ struct alc_spec {
         struct snd_kcontrol_new *mixers[5];     /* mixer arrays */
         unsigned int num_mixers;
         struct snd_kcontrol_new *cap_mixer;     /* capture mixer */
+        unsigned int beep_amp;  /* beep amp value, set via set_beep_amp() */
 
         const struct hda_verb *init_verbs[5];   /* initialization verbs
                                                  * don't forget NULL
@@ -269,13 +280,15 @@ struct alc_spec {
                                          * dig_out_nid and hp_nid are optional
                                          */
         hda_nid_t alt_dac_nid;
+        hda_nid_t slave_dig_outs[3];    /* optional - for auto-parsing */
+        int dig_out_type;
 
         /* capture */
         unsigned int num_adc_nids;
         hda_nid_t *adc_nids;
         hda_nid_t *capsrc_nids;
         hda_nid_t dig_in_nid;           /* digital-in NID; optional */
-        unsigned char is_mix_capture;   /* matrix-style capture (non-mux) */
+        int capture_style;              /* capture style (CAPT_*) */
 
         /* capture source */
         unsigned int num_mux_defs;
@@ -293,7 +306,7 @@ struct alc_spec {
         /* dynamic controls, init_verbs and input_mux */
         struct auto_pin_cfg autocfg;
         struct snd_array kctls;
-        struct hda_input_mux private_imux;
+        struct hda_input_mux private_imux[3];
         hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
 
         /* hooks */
@@ -305,6 +318,9 @@ struct alc_spec {
         unsigned int jack_present: 1;
         unsigned int master_sw: 1;
 
+        /* other flags */
+        unsigned int no_analog :1; /* digital I/O only */
+
         /* for virtual master */
         hda_nid_t vmaster_nid;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
@@ -314,13 +330,6 @@ struct alc_spec {
         /* for PLL fix */
         hda_nid_t pll_nid;
         unsigned int pll_coef_idx, pll_coef_bit;
-
-#ifdef SND_HDA_NEEDS_RESUME
-#define ALC_MAX_PINS    16
-        unsigned int num_pins;
-        hda_nid_t pin_nids[ALC_MAX_PINS];
-        unsigned int pin_cfgs[ALC_MAX_PINS];
-#endif
 };
 
 /*
@@ -336,6 +345,7 @@ struct alc_config_preset {
         hda_nid_t *dac_nids;
         hda_nid_t dig_out_nid;          /* optional */
         hda_nid_t hp_nid;               /* optional */
+        hda_nid_t *slave_dig_outs;
         unsigned int num_adc_nids;
         hda_nid_t *adc_nids;
         hda_nid_t *capsrc_nids;
@@ -392,7 +402,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 (spec->is_mix_capture) {
+        if (spec->capture_style &&
+            !(spec->capture_style == CAPT_1MUX_MIX && !adc_idx)) {
                 /* Matrix-mixer style (e.g. ALC882) */
                 unsigned int *cur_val = &spec->cur_mux[adc_idx];
                 unsigned int i, idx;
@@ -750,6 +761,24 @@ static int alc_eapd_ctrl_put(struct snd_kcontrol *kcontrol,
 #endif   /* CONFIG_SND_DEBUG */
 
 /*
+ * set up the input pin config (depending on the given auto-pin type)
+ */
+static void alc_set_input_pin(struct hda_codec *codec, hda_nid_t nid,
+                              int auto_pin_type)
+{
+        unsigned int val = PIN_IN;
+
+        if (auto_pin_type <= AUTO_PIN_FRONT_MIC) {
+                unsigned int pincap;
+                pincap = snd_hda_query_pin_caps(codec, nid);
+                pincap = (pincap & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT;
+                if (pincap & AC_PINCAP_VREF_80)
+                        val = PIN_VREF80;
+        }
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, val);
+}
+
+/*
  */
 static void add_mixer(struct alc_spec *spec, struct snd_kcontrol_new *mix)
 {
@@ -810,6 +839,7 @@ static void setup_preset(struct alc_spec *spec,
         spec->multiout.num_dacs = preset->num_dacs;
         spec->multiout.dac_nids = preset->dac_nids;
         spec->multiout.dig_out_nid = preset->dig_out_nid;
+        spec->multiout.slave_dig_outs = preset->slave_dig_outs;
         spec->multiout.hp_nid = preset->hp_nid;
 
         spec->num_mux_defs = preset->num_mux_defs;
@@ -921,7 +951,7 @@ static void alc_mic_automute(struct hda_codec *codec)
                          HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
 }
 #else
-#define alc_mic_automute(codec) /* NOP */
+#define alc_mic_automute(codec) do {} while(0) /* NOP */
 #endif /* disabled */
 
 /* unsolicited event for HP jack sensing */
@@ -952,7 +982,7 @@ static void alc888_coef_init(struct hda_codec *codec)
         snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 0);
         tmp = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_PROC_COEF, 0);
         snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 7);
-        if ((tmp & 0xf0) == 2)
+        if ((tmp & 0xf0) == 0x20)
                 /* alc888S-VC */
                 snd_hda_codec_read(codec, 0x20, 0,
                                    AC_VERB_SET_PROC_COEF, 0x830);
@@ -991,8 +1021,7 @@ static void alc_subsystem_id(struct hda_codec *codec,
         nid = 0x1d;
         if (codec->vendor_id == 0x10ec0260)
                 nid = 0x17;
-        ass = snd_hda_codec_read(codec, nid, 0,
-                                 AC_VERB_GET_CONFIG_DEFAULT, 0);
+        ass = snd_hda_codec_get_pincfg(codec, nid);
         if (!(ass & 1) && !(ass & 0x100000))
                 return;
         if ((ass >> 30) != 1)   /* no physical connection */
@@ -1166,16 +1195,8 @@ static void alc_fix_pincfg(struct hda_codec *codec,
                 return;
 
         cfg = pinfix[quirk->value];
-        for (; cfg->nid; cfg++) {
-                int i;
-                u32 val = cfg->val;
-                for (i = 0; i < 4; i++) {
-                        snd_hda_codec_write(codec, cfg->nid, 0,
-                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_0 + i,
-                                    val & 0xff);
-                        val >>= 8;
-                }
-        }
+        for (; cfg->nid; cfg++)
+                snd_hda_codec_set_pincfg(codec, cfg->nid, cfg->val);
 }
 
 /*
@@ -1375,8 +1396,6 @@ static struct snd_kcontrol_new alc888_base_mixer[] = {
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -1483,8 +1502,6 @@ static struct snd_kcontrol_new alc880_three_stack_mixer[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x3, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x19, 0x0, HDA_OUTPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1578,8 +1595,7 @@ static int alc_cap_sw_put(struct snd_kcontrol *kcontrol,
                                      snd_hda_mixer_amp_switch_put);
 }
 
-#define DEFINE_CAPMIX(num) \
-static struct snd_kcontrol_new alc_capture_mixer ## num[] = { \
+#define _DEFINE_CAPMIX(num) \
         { \
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
                 .name = "Capture Switch", \
@@ -1600,7 +1616,9 @@ static struct snd_kcontrol_new alc_capture_mixer ## num[] = { \
                 .get = alc_cap_vol_get, \
                 .put = alc_cap_vol_put, \
                 .tlv = { .c = alc_cap_vol_tlv }, \
-        }, \
+        }
+
+#define _DEFINE_CAPSRC(num) \
         { \
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
                 /* .name = "Capture Source", */ \
@@ -1609,15 +1627,28 @@ static struct snd_kcontrol_new alc_capture_mixer ## num[] = { \
                 .info = alc_mux_enum_info, \
                 .get = alc_mux_enum_get, \
                 .put = alc_mux_enum_put, \
-        }, \
-        { } /* end */ \
+        }
+
+#define DEFINE_CAPMIX(num) \
+static struct snd_kcontrol_new alc_capture_mixer ## num[] = { \
+        _DEFINE_CAPMIX(num),                                  \
+        _DEFINE_CAPSRC(num),                                  \
+        { } /* end */                                         \
+}
+
+#define DEFINE_CAPMIX_NOSRC(num) \
+static struct snd_kcontrol_new alc_capture_mixer_nosrc ## num[] = { \
+        _DEFINE_CAPMIX(num),                                        \
+        { } /* end */                                               \
 }
 
 /* up to three ADCs */
 DEFINE_CAPMIX(1);
 DEFINE_CAPMIX(2);
 DEFINE_CAPMIX(3);
-
+DEFINE_CAPMIX_NOSRC(1);
+DEFINE_CAPMIX_NOSRC(2);
+DEFINE_CAPMIX_NOSRC(3);
 
 /*
  * ALC880 5-stack model
@@ -1706,8 +1737,6 @@ static struct snd_kcontrol_new alc880_six_stack_mixer[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Channel Mode",
@@ -1884,13 +1913,6 @@ static struct snd_kcontrol_new alc880_asus_w1v_mixer[] = {
         { } /* end */
 };
 
-/* additional mixers to alc880_asus_mixer */
-static struct snd_kcontrol_new alc880_pcbeep_mixer[] = {
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-        { } /* end */
-};
-
 /* TCL S700 */
 static struct snd_kcontrol_new alc880_tcl_s700_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
@@ -1923,8 +1945,6 @@ static struct snd_kcontrol_new alc880_uniwill_mixer[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Channel Mode",
@@ -1999,6 +2019,13 @@ static const char *alc_slave_sws[] = {
 
 static void alc_free_kctls(struct hda_codec *codec);
 
+/* 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),
+        { } /* end */
+};
+
 static int alc_build_controls(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -2020,11 +2047,13 @@ static int alc_build_controls(struct hda_codec *codec)
                                                     spec->multiout.dig_out_nid);
                 if (err < 0)
                         return err;
-                err = snd_hda_create_spdif_share_sw(codec,
-                                                    &spec->multiout);
-                if (err < 0)
-                        return err;
-                spec->multiout.share_spdif = 1;
+                if (!spec->no_analog) {
+                        err = snd_hda_create_spdif_share_sw(codec,
+                                                            &spec->multiout);
+                        if (err < 0)
+                                return err;
+                        spec->multiout.share_spdif = 1;
+                }
         }
         if (spec->dig_in_nid) {
                 err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
@@ -2032,8 +2061,24 @@ static int alc_build_controls(struct hda_codec *codec)
                         return err;
         }
 
+        /* create beep controls if needed */
+        if (spec->beep_amp) {
+                struct snd_kcontrol_new *knew;
+                for (knew = alc_beep_mixer; knew->name; knew++) {
+                        struct snd_kcontrol *kctl;
+                        kctl = snd_ctl_new1(knew, codec);
+                        if (!kctl)
+                                return -ENOMEM;
+                        kctl->private_value = spec->beep_amp;
+                        err = snd_hda_ctl_add(codec, kctl);
+                        if (err < 0)
+                                return err;
+                }
+        }
+
         /* if we have no master control, let's create it */
-        if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
+        if (!spec->no_analog &&
+            !snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
                 unsigned int vmaster_tlv[4];
                 snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid,
                                         HDA_OUTPUT, vmaster_tlv);
@@ -2042,7 +2087,8 @@ static int alc_build_controls(struct hda_codec *codec)
                 if (err < 0)
                         return err;
         }
-        if (!snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {
+        if (!spec->no_analog &&
+            !snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {
                 err = snd_hda_add_vmaster(codec, "Master Playback Switch",
                                           NULL, alc_slave_sws);
                 if (err < 0)
@@ -2951,6 +2997,14 @@ static int alc880_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
                                              stream_tag, format, substream);
 }
 
+static int alc880_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                           struct hda_codec *codec,
+                                           struct snd_pcm_substream *substream)
+{
+        struct alc_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout);
+}
+
 static int alc880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
                                          struct hda_codec *codec,
                                          struct snd_pcm_substream *substream)
@@ -3034,7 +3088,8 @@ static struct hda_pcm_stream alc880_pcm_digital_playback = {
         .ops = {
                 .open = alc880_dig_playback_pcm_open,
                 .close = alc880_dig_playback_pcm_close,
-                .prepare = alc880_dig_playback_pcm_prepare
+                .prepare = alc880_dig_playback_pcm_prepare,
+                .cleanup = alc880_dig_playback_pcm_cleanup
         },
 };
 
@@ -3061,6 +3116,9 @@ static int alc_build_pcms(struct hda_codec *codec)
         codec->num_pcms = 1;
         codec->pcm_info = info;
 
+        if (spec->no_analog)
+                goto skip_analog;
+
         info->name = spec->stream_name_analog;
         if (spec->stream_analog_playback) {
                 if (snd_BUG_ON(!spec->multiout.dac_nids))
@@ -3084,12 +3142,17 @@ static int alc_build_pcms(struct hda_codec *codec)
                 }
         }
 
+ skip_analog:
         /* SPDIF for stream index #1 */
         if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
                 codec->num_pcms = 2;
+                codec->slave_dig_outs = spec->multiout.slave_dig_outs;
                 info = spec->pcm_rec + 1;
                 info->name = spec->stream_name_digital;
-                info->pcm_type = HDA_PCM_TYPE_SPDIF;
+                if (spec->dig_out_type)
+                        info->pcm_type = spec->dig_out_type;
+                else
+                        info->pcm_type = HDA_PCM_TYPE_SPDIF;
                 if (spec->multiout.dig_out_nid &&
                     spec->stream_digital_playback) {
                         info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_digital_playback);
@@ -3104,6 +3167,9 @@ static int alc_build_pcms(struct hda_codec *codec)
                 codec->spdif_status_reset = 1;
         }
 
+        if (spec->no_analog)
+                return 0;
+
         /* If the use of more than one ADC is requested for the current
          * model, configure a second analog capture-only PCM.
          */
@@ -3162,65 +3228,17 @@ static void alc_free(struct hda_codec *codec)
 
         alc_free_kctls(codec);
         kfree(spec);
-        codec->spec = NULL; /* to be sure */
+        snd_hda_detach_beep_device(codec);
 }
 
 #ifdef SND_HDA_NEEDS_RESUME
-static void store_pin_configs(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        hda_nid_t nid, end_nid;
-
-        end_nid = codec->start_nid + codec->num_nodes;
-        for (nid = codec->start_nid; nid < end_nid; nid++) {
-                unsigned int wid_caps = get_wcaps(codec, nid);
-                unsigned int wid_type =
-                        (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
-                if (wid_type != AC_WID_PIN)
-                        continue;
-                if (spec->num_pins >= ARRAY_SIZE(spec->pin_nids))
-                        break;
-                spec->pin_nids[spec->num_pins] = nid;
-                spec->pin_cfgs[spec->num_pins] =
-                        snd_hda_codec_read(codec, nid, 0,
-                                           AC_VERB_GET_CONFIG_DEFAULT, 0);
-                spec->num_pins++;
-        }
-}
-
-static void resume_pin_configs(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < spec->num_pins; i++) {
-                hda_nid_t pin_nid = spec->pin_nids[i];
-                unsigned int pin_config = spec->pin_cfgs[i];
-                snd_hda_codec_write(codec, pin_nid, 0,
-                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_0,
-                                    pin_config & 0x000000ff);
-                snd_hda_codec_write(codec, pin_nid, 0,
-                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_1,
-                                    (pin_config & 0x0000ff00) >> 8);
-                snd_hda_codec_write(codec, pin_nid, 0,
-                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_2,
-                                    (pin_config & 0x00ff0000) >> 16);
-                snd_hda_codec_write(codec, pin_nid, 0,
-                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_3,
-                                    pin_config >> 24);
-        }
-}
-
 static int alc_resume(struct hda_codec *codec)
 {
-        resume_pin_configs(codec);
         codec->patch_ops.init(codec);
         snd_hda_codec_resume_amp(codec);
         snd_hda_codec_resume_cache(codec);
         return 0;
 }
-#else
-#define store_pin_configs(codec)
 #endif
 
 /*
@@ -3559,7 +3577,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x8181, "ASUS P4GPL", ALC880_ASUS_DIG),
         SND_PCI_QUIRK(0x1043, 0x8196, "ASUS P5GD1", ALC880_6ST),
         SND_PCI_QUIRK(0x1043, 0x81b4, "ASUS", ALC880_6ST),
-        SND_PCI_QUIRK(0x1043, 0, "ASUS", ALC880_ASUS), /* default ASUS */
+        SND_PCI_QUIRK_VENDOR(0x1043, "ASUS", ALC880_ASUS), /* default ASUS */
         SND_PCI_QUIRK(0x104d, 0x81a0, "Sony", ALC880_3ST),
         SND_PCI_QUIRK(0x104d, 0x81d6, "Sony", ALC880_3ST),
         SND_PCI_QUIRK(0x107b, 0x3032, "Gateway", ALC880_5ST),
@@ -3602,7 +3620,8 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
         SND_PCI_QUIRK(0x8086, 0xe400, "Intel mobo", ALC880_5ST_DIG),
         SND_PCI_QUIRK(0x8086, 0xe401, "Intel mobo", ALC880_5ST_DIG),
         SND_PCI_QUIRK(0x8086, 0xe402, "Intel mobo", ALC880_5ST_DIG),
-        SND_PCI_QUIRK(0x8086, 0, "Intel mobo", ALC880_3ST), /* default Intel */
+        /* default Intel */
+        SND_PCI_QUIRK_VENDOR(0x8086, "Intel mobo", ALC880_3ST),
         SND_PCI_QUIRK(0xa0a0, 0x0560, "AOpen i915GMm-HFS", ALC880_5ST_DIG),
         SND_PCI_QUIRK(0xe803, 0x1019, NULL, ALC880_6ST_DIG),
         {}
@@ -3782,7 +3801,7 @@ static struct alc_config_preset alc880_presets[] = {
                 .input_mux = &alc880_capture_source,
         },
         [ALC880_UNIWILL_DIG] = {
-                .mixers = { alc880_asus_mixer, alc880_pcbeep_mixer },
+                .mixers = { alc880_asus_mixer },
                 .init_verbs = { alc880_volume_init_verbs,
                                 alc880_pin_asus_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
@@ -3820,8 +3839,7 @@ static struct alc_config_preset alc880_presets[] = {
                 .init_hook = alc880_uniwill_p53_hp_automute,
         },
         [ALC880_FUJITSU] = {
-                .mixers = { alc880_fujitsu_mixer,
-                            alc880_pcbeep_mixer, },
+                .mixers = { alc880_fujitsu_mixer },
                 .init_verbs = { alc880_volume_init_verbs,
                                 alc880_uniwill_p53_init_verbs,
                                 alc880_beep_init_verbs },
@@ -4114,7 +4132,7 @@ static int new_analog_input(struct alc_spec *spec, hda_nid_t pin,
 static int alc880_auto_create_analog_input_ctls(struct alc_spec *spec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        struct hda_input_mux *imux = &spec->private_imux;
+        struct hda_input_mux *imux = &spec->private_imux[0];
         int i, err, idx;
 
         for (i = 0; i < AUTO_PIN_LAST; i++) {
@@ -4202,11 +4220,9 @@ static void alc880_auto_init_analog_input(struct hda_codec *codec)
         for (i = 0; i < AUTO_PIN_LAST; i++) {
                 hda_nid_t nid = spec->autocfg.input_pins[i];
                 if (alc880_is_input_pin(nid)) {
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            i <= AUTO_PIN_FRONT_MIC ?
-                                            PIN_VREF80 : PIN_IN);
-                        if (nid != ALC880_PIN_CD_NID)
+                        alc_set_input_pin(codec, nid, i);
+                        if (nid != ALC880_PIN_CD_NID &&
+                            (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
                                 snd_hda_codec_write(codec, nid, 0,
                                                     AC_VERB_SET_AMP_GAIN_MUTE,
                                                     AMP_OUT_MUTE);
@@ -4221,7 +4237,7 @@ static void alc880_auto_init_analog_input(struct hda_codec *codec)
 static int alc880_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        int err;
+        int i, err;
         static hda_nid_t alc880_ignore[] = { 0x1d, 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
@@ -4252,8 +4268,23 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
-                spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
+        /* check multiple SPDIF-out (for recent codecs) */
+        for (i = 0; i < spec->autocfg.dig_outs; i++) {
+                hda_nid_t dig_nid;
+                err = snd_hda_get_connections(codec,
+                                              spec->autocfg.dig_out_pins[i],
+                                              &dig_nid, 1);
+                if (err < 0)
+                        continue;
+                if (!i)
+                        spec->multiout.dig_out_nid = dig_nid;
+                else {
+                        spec->multiout.slave_dig_outs = spec->slave_dig_outs;
+                        spec->slave_dig_outs[i - 1] = dig_nid;
+                        if (i == ARRAY_SIZE(spec->slave_dig_outs) - 1)
+                                break;
+                }
+        }
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = ALC880_DIGIN_NID;
 
@@ -4263,9 +4294,8 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
         add_verb(spec, alc880_volume_init_verbs);
 
         spec->num_mux_defs = 1;
-        spec->input_mux = &spec->private_imux;
+        spec->input_mux = &spec->private_imux[0];
 
-        store_pin_configs(codec);
         return 1;
 }
 
@@ -4280,21 +4310,33 @@ static void alc880_auto_init(struct hda_codec *codec)
                 alc_inithook(codec);
 }
 
-/*
- * OK, here we have finally the patch for ALC880
- */
-
 static void set_capture_mixer(struct alc_spec *spec)
 {
-        static struct snd_kcontrol_new *caps[3] = {
-                alc_capture_mixer1,
-                alc_capture_mixer2,
-                alc_capture_mixer3,
+        static struct snd_kcontrol_new *caps[2][3] = {
+                { alc_capture_mixer_nosrc1,
+                  alc_capture_mixer_nosrc2,
+                  alc_capture_mixer_nosrc3 },
+                { alc_capture_mixer1,
+                  alc_capture_mixer2,
+                  alc_capture_mixer3 },
         };
-        if (spec->num_adc_nids > 0 && spec->num_adc_nids <= 3)
-                spec->cap_mixer = caps[spec->num_adc_nids - 1];
+        if (spec->num_adc_nids > 0 && spec->num_adc_nids <= 3) {
+                int mux;
+                if (spec->input_mux && spec->input_mux->num_items > 1)
+                        mux = 1;
+                else
+                        mux = 0;
+                spec->cap_mixer = caps[mux][spec->num_adc_nids - 1];
+        }
 }
 
+#define set_beep_amp(spec, nid, idx, dir) \
+        ((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 3, idx, dir))
+
+/*
+ * OK, here we have finally the patch for ALC880
+ */
+
 static int patch_alc880(struct hda_codec *codec)
 {
         struct alc_spec *spec;
@@ -4330,6 +4372,12 @@ static int patch_alc880(struct hda_codec *codec)
                 }
         }
 
+        err = snd_hda_attach_beep_device(codec, 0x1);
+        if (err < 0) {
+                alc_free(codec);
+                return err;
+        }
+
         if (board_config != ALC880_AUTO)
                 setup_preset(spec, &alc880_presets[board_config]);
 
@@ -4356,6 +4404,7 @@ static int patch_alc880(struct hda_codec *codec)
                 }
         }
         set_capture_mixer(spec);
+        set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
         spec->vmaster_nid = 0x0c;
 
@@ -4463,6 +4512,26 @@ static struct hda_input_mux alc260_acer_capture_sources[2] = {
                 },
         },
 };
+
+/* Maxdata Favorit 100XS */
+static struct hda_input_mux alc260_favorit100_capture_sources[2] = {
+        {
+                .num_items = 2,
+                .items = {
+                        { "Line/Mic", 0x0 },
+                        { "CD", 0x4 },
+                },
+        },
+        {
+                .num_items = 3,
+                .items = {
+                        { "Line/Mic", 0x0 },
+                        { "CD", 0x4 },
+                        { "Mixer", 0x5 },
+                },
+        },
+};
+
 /*
  * This is just place-holder, so there's something for alc_build_pcms to look
  * at when it calculates the maximum number of channels. ALC260 has no mixer
@@ -4505,12 +4574,6 @@ static struct snd_kcontrol_new alc260_input_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc260_pc_beep_mixer[] = {
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x07, 0x05, HDA_INPUT),
-        { } /* end */
-};
-
 /* update HP, line and mono out pins according to the master switch */
 static void alc260_hp_master_update(struct hda_codec *codec,
                                     hda_nid_t hp, hda_nid_t line,
@@ -4702,8 +4765,6 @@ static struct snd_kcontrol_new alc260_fujitsu_mixer[] = {
         HDA_CODEC_VOLUME("Mic/Line Playback Volume", 0x07, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic/Line Playback Switch", 0x07, 0x0, HDA_INPUT),
         ALC_PIN_MODE("Mic/Line Jack Mode", 0x12, ALC_PIN_DIR_IN),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x09, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Speaker Playback Switch", 0x09, 2, HDA_INPUT),
         { } /* end */
@@ -4748,8 +4809,18 @@ static struct snd_kcontrol_new alc260_acer_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
         ALC_PIN_MODE("Line Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
+        { } /* end */
+};
+
+/* Maxdata Favorit 100XS: one output and one input (0x12) jack
+ */
+static struct snd_kcontrol_new alc260_favorit100_mixer[] = {
+        HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT),
+        ALC_PIN_MODE("Output Jack Mode", 0x0f, ALC_PIN_DIR_INOUT),
+        HDA_CODEC_VOLUME("Line/Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Line/Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
+        ALC_PIN_MODE("Line/Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),
         { } /* end */
 };
 
@@ -4767,8 +4838,6 @@ static struct snd_kcontrol_new alc260_will_mixer[] = {
         ALC_PIN_MODE("Line Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -5126,6 +5195,89 @@ static struct hda_verb alc260_acer_init_verbs[] = {
         { }
 };
 
+/* Initialisation sequence for Maxdata Favorit 100XS
+ * (adapted from Acer init verbs).
+ */
+static struct hda_verb alc260_favorit100_init_verbs[] = {
+        /* GPIO 0 enables the output jack.
+         * Turn this on and rely on the standard mute
+         * methods whenever the user wants to turn these outputs off.
+         */
+        {0x01, AC_VERB_SET_GPIO_MASK, 0x01},
+        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
+        {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
+        /* Line/Mic input jack is connected to Mic1 pin */
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},
+        /* Ensure all other unused pins are disabled and muted. */
+        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        /* Disable digital (SPDIF) pins */
+        {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
+        {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
+
+        /* Ensure Mic1 and Line1 pin widgets take input from the OUT1 sum
+         * bus when acting as outputs.
+         */
+        {0x0b, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x0d, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* Start with output sum widgets muted and their output gains at min */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+        /* Unmute Line-out pin widget amp left and right
+         * (no equiv mixer ctrl)
+         */
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Unmute Mic1 and Line1 pin widget input buffers since they start as
+         * inputs. If the pin mode is changed by the user the pin mode control
+         * will take care of enabling the pin's input/output buffers as needed.
+         * Therefore there's no need to enable the input buffer at this
+         * stage.
+         */
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+        /* Mute capture amp left and right */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        /* Set ADC connection select to match default mixer setting - mic
+         * (on mic1 pin)
+         */
+        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* Do similar with the second ADC: mute capture input amp and
+         * set ADC connection to mic to match ALSA's default state.
+         */
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* Mute all inputs to mixer widget (even unconnected ones) */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
+
+        { }
+};
+
 static struct hda_verb alc260_will_verbs[] = {
         {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x0b, AC_VERB_SET_CONNECT_SEL, 0x00},
@@ -5272,8 +5424,6 @@ static struct snd_kcontrol_new alc260_test_mixer[] = {
         HDA_CODEC_MUTE("LINE2 Playback Switch", 0x07, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
         HDA_CODEC_VOLUME("LINE-OUT loopback Playback Volume", 0x07, 0x06, HDA_INPUT),
         HDA_CODEC_MUTE("LINE-OUT loopback Playback Switch", 0x07, 0x06, HDA_INPUT),
         HDA_CODEC_VOLUME("HP-OUT loopback Playback Volume", 0x07, 0x7, HDA_INPUT),
@@ -5471,7 +5621,7 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec,
 static int alc260_auto_create_analog_input_ctls(struct alc_spec *spec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        struct hda_input_mux *imux = &spec->private_imux;
+        struct hda_input_mux *imux = &spec->private_imux[0];
         int i, err, idx;
 
         for (i = 0; i < AUTO_PIN_LAST; i++) {
@@ -5546,11 +5696,9 @@ static void alc260_auto_init_analog_input(struct hda_codec *codec)
         for (i = 0; i < AUTO_PIN_LAST; i++) {
                 hda_nid_t nid = spec->autocfg.input_pins[i];
                 if (nid >= 0x12) {
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            i <= AUTO_PIN_FRONT_MIC ?
-                                            PIN_VREF80 : PIN_IN);
-                        if (nid != ALC260_PIN_CD_NID)
+                        alc_set_input_pin(codec, nid, i);
+                        if (nid != ALC260_PIN_CD_NID &&
+                            (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
                                 snd_hda_codec_write(codec, nid, 0,
                                                     AC_VERB_SET_AMP_GAIN_MUTE,
                                                     AMP_OUT_MUTE);
@@ -5623,7 +5771,7 @@ static int alc260_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = ALC260_DIGOUT_NID;
         if (spec->kctls.list)
                 add_mixer(spec, spec->kctls.list);
@@ -5631,9 +5779,8 @@ static int alc260_parse_auto_config(struct hda_codec *codec)
         add_verb(spec, alc260_volume_init_verbs);
 
         spec->num_mux_defs = 1;
-        spec->input_mux = &spec->private_imux;
+        spec->input_mux = &spec->private_imux[0];
 
-        store_pin_configs(codec);
         return 1;
 }
 
@@ -5670,6 +5817,7 @@ static const char *alc260_models[ALC260_MODEL_LAST] = {
         [ALC260_ACER]           = "acer",
         [ALC260_WILL]           = "will",
         [ALC260_REPLACER_672V]  = "replacer",
+        [ALC260_FAVORIT100]     = "favorit100",
 #ifdef CONFIG_SND_DEBUG
         [ALC260_TEST]           = "test",
 #endif
@@ -5679,6 +5827,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, 0x008f, "Acer", ALC260_ACER),
+        SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),
         SND_PCI_QUIRK(0x103c, 0x2808, "HP d5700", ALC260_HP_3013),
         SND_PCI_QUIRK(0x103c, 0x280a, "HP d5750", ALC260_HP_3013),
         SND_PCI_QUIRK(0x103c, 0x3010, "HP", ALC260_HP_3013),
@@ -5701,8 +5850,7 @@ static struct snd_pci_quirk alc260_cfg_tbl[] = {
 static struct alc_config_preset alc260_presets[] = {
         [ALC260_BASIC] = {
                 .mixers = { alc260_base_output_mixer,
-                            alc260_input_mixer,
-                            alc260_pc_beep_mixer },
+                            alc260_input_mixer },
                 .init_verbs = { alc260_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc260_dac_nids),
                 .dac_nids = alc260_dac_nids,
@@ -5781,6 +5929,18 @@ static struct alc_config_preset alc260_presets[] = {
                 .num_mux_defs = ARRAY_SIZE(alc260_acer_capture_sources),
                 .input_mux = alc260_acer_capture_sources,
         },
+        [ALC260_FAVORIT100] = {
+                .mixers = { alc260_favorit100_mixer },
+                .init_verbs = { alc260_favorit100_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+                .dac_nids = alc260_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),
+                .adc_nids = alc260_dual_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc260_modes),
+                .channel_mode = alc260_modes,
+                .num_mux_defs = ARRAY_SIZE(alc260_favorit100_capture_sources),
+                .input_mux = alc260_favorit100_capture_sources,
+        },
         [ALC260_WILL] = {
                 .mixers = { alc260_will_mixer },
                 .init_verbs = { alc260_init_verbs, alc260_will_verbs },
@@ -5857,6 +6017,12 @@ static int patch_alc260(struct hda_codec *codec)
                 }
         }
 
+        err = snd_hda_attach_beep_device(codec, 0x1);
+        if (err < 0) {
+                alc_free(codec);
+                return err;
+        }
+
         if (board_config != ALC260_AUTO)
                 setup_preset(spec, &alc260_presets[board_config]);
 
@@ -5882,6 +6048,7 @@ static int patch_alc260(struct hda_codec *codec)
                 }
         }
         set_capture_mixer(spec);
+        set_beep_amp(spec, 0x07, 0x05, HDA_INPUT);
 
         spec->vmaster_nid = 0x08;
 
@@ -6053,8 +6220,6 @@ static struct snd_kcontrol_new alc882_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -6081,8 +6246,6 @@ static struct snd_kcontrol_new alc882_w2jc_mixer[] = {
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -6134,8 +6297,6 @@ static struct snd_kcontrol_new alc882_asus_a7m_mixer[] = {
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -6244,8 +6405,10 @@ static struct snd_kcontrol_new alc882_macpro_mixer[] = {
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x18, 0x0, HDA_OUTPUT),
         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),
+        */
         { } /* end */
 };
 
@@ -6877,19 +7040,9 @@ static void alc882_auto_init_analog_input(struct hda_codec *codec)
 
         for (i = 0; i < AUTO_PIN_LAST; i++) {
                 hda_nid_t nid = spec->autocfg.input_pins[i];
-                unsigned int vref;
                 if (!nid)
                         continue;
-                vref = PIN_IN;
-                if (1 /*i <= AUTO_PIN_FRONT_MIC*/) {
-                        unsigned int pincap;
-                        pincap = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
-                        if ((pincap >> AC_PINCAP_VREF_SHIFT) &
-                            AC_PINCAP_VREF_80)
-                                vref = PIN_VREF80;
-                }
-                snd_hda_codec_write(codec, nid, 0,
-                                    AC_VERB_SET_PIN_WIDGET_CONTROL, vref);
+                alc_set_input_pin(codec, nid, AUTO_PIN_FRONT_MIC /*i*/);
                 if (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)
                         snd_hda_codec_write(codec, nid, 0,
                                             AC_VERB_SET_AMP_GAIN_MUTE,
@@ -6900,18 +7053,21 @@ static void alc882_auto_init_analog_input(struct hda_codec *codec)
 static void alc882_auto_init_input_src(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        const struct hda_input_mux *imux = spec->input_mux;
         int c;
 
         for (c = 0; c < spec->num_adc_nids; c++) {
                 hda_nid_t conn_list[HDA_MAX_NUM_INPUTS];
                 hda_nid_t nid = spec->capsrc_nids[c];
+                unsigned int mux_idx;
+                const struct hda_input_mux *imux;
                 int conns, mute, idx, item;
 
                 conns = snd_hda_get_connections(codec, nid, conn_list,
                                                 ARRAY_SIZE(conn_list));
                 if (conns < 0)
                         continue;
+                mux_idx = c >= spec->num_mux_defs ? 0 : c;
+                imux = &spec->input_mux[mux_idx];
                 for (idx = 0; idx < conns; idx++) {
                         /* if the current connection is the selected one,
                          * unmute it as default - otherwise mute it
@@ -6924,8 +7080,20 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)
                                         break;
                                 }
                         }
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_AMP_GAIN_MUTE, mute);
+                        /* check if we have a selector or mixer
+                         * we could check for the widget type instead, but
+                         * just check for Amp-In presence (in case of mixer
+                         * without amp-in there is something wrong, this
+                         * function shouldn't be used or capsrc nid is wrong)
+                         */
+                        if (get_wcaps(codec, nid) & AC_WCAP_IN_AMP)
+                                snd_hda_codec_write(codec, nid, 0,
+                                                    AC_VERB_SET_AMP_GAIN_MUTE,
+                                                    mute);
+                        else if (mute != AMP_IN_MUTE(idx))
+                                snd_hda_codec_write(codec, nid, 0,
+                                                    AC_VERB_SET_CONNECT_SEL,
+                                                    idx);
                 }
         }
 }
@@ -7054,6 +7222,12 @@ static int patch_alc882(struct hda_codec *codec)
                 }
         }
 
+        err = snd_hda_attach_beep_device(codec, 0x1);
+        if (err < 0) {
+                alc_free(codec);
+                return err;
+        }
+
         if (board_config != ALC882_AUTO)
                 setup_preset(spec, &alc882_presets[board_config]);
 
@@ -7074,7 +7248,7 @@ static int patch_alc882(struct hda_codec *codec)
         spec->stream_digital_playback = &alc882_pcm_digital_playback;
         spec->stream_digital_capture = &alc882_pcm_digital_capture;
 
-        spec->is_mix_capture = 1; /* matrix-style capture */
+        spec->capture_style = CAPT_MIX; /* matrix-style capture */
         if (!spec->adc_nids && spec->input_mux) {
                 /* check whether NID 0x07 is valid */
                 unsigned int wcap = get_wcaps(codec, 0x07);
@@ -7091,6 +7265,7 @@ static int patch_alc882(struct hda_codec *codec)
                 }
         }
         set_capture_mixer(spec);
+        set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
         spec->vmaster_nid = 0x0c;
 
@@ -7142,10 +7317,14 @@ static hda_nid_t alc883_adc_nids_rev[2] = {
         0x09, 0x08
 };
 
+#define alc889_adc_nids         alc880_adc_nids
+
 static hda_nid_t alc883_capsrc_nids[2] = { 0x23, 0x22 };
 
 static hda_nid_t alc883_capsrc_nids_rev[2] = { 0x22, 0x23 };
 
+#define alc889_capsrc_nids      alc882_capsrc_nids
+
 /* input MUX */
 /* FIXME: should be a matrix-type input source selection */
 
@@ -7363,8 +7542,6 @@ static struct snd_kcontrol_new alc883_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -7427,8 +7604,6 @@ static struct snd_kcontrol_new alc883_3ST_2ch_mixer[] = {
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -7452,8 +7627,6 @@ static struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = {
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -7478,8 +7651,6 @@ static struct snd_kcontrol_new alc883_3ST_6ch_intel_mixer[] = {
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -7503,8 +7674,6 @@ static struct snd_kcontrol_new alc883_fivestack_mixer[] = {
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -7912,36 +8081,83 @@ static struct hda_verb alc888_lenovo_sky_verbs[] = {
         { } /* end */
 };
 
+static struct hda_verb alc888_6st_dell_verbs[] = {
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
+        { }
+};
+
+static void alc888_3st_hp_front_automute(struct hda_codec *codec)
+{
+        unsigned int present, bits;
+
+        present = snd_hda_codec_read(codec, 0x1b, 0,
+                        AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
+        snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
+        snd_hda_codec_amp_stereo(codec, 0x18, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
+}
+
+static void alc888_3st_hp_unsol_event(struct hda_codec *codec,
+                                      unsigned int res)
+{
+        switch (res >> 26) {
+        case ALC880_HP_EVENT:
+                alc888_3st_hp_front_automute(codec);
+                break;
+        }
+}
+
 static struct hda_verb alc888_3st_hp_verbs[] = {
         {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},  /* Front: output 0 (0x0c) */
         {0x16, AC_VERB_SET_CONNECT_SEL, 0x01},  /* Rear : output 1 (0x0d) */
         {0x18, AC_VERB_SET_CONNECT_SEL, 0x02},  /* CLFE : output 2 (0x0e) */
-        { }
-};
-
-static struct hda_verb alc888_6st_dell_verbs[] = {
         {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
-        { }
+        { } /* end */
 };
 
+/*
+ * 2ch mode
+ */
 static struct hda_verb alc888_3st_hp_2ch_init[] = {
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         { 0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
-        { }
+        { } /* end */
+};
+
+/*
+ * 4ch mode
+ */
+static struct hda_verb alc888_3st_hp_4ch_init[] = {
+        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
+        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+        { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        { 0x16, AC_VERB_SET_CONNECT_SEL, 0x01 },
+        { } /* end */
 };
 
+/*
+ * 6ch mode
+ */
 static struct hda_verb alc888_3st_hp_6ch_init[] = {
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        { 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },
         { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
-        { }
+        { 0x16, AC_VERB_SET_CONNECT_SEL, 0x01 },
+        { } /* end */
 };
 
-static struct hda_channel_mode alc888_3st_hp_modes[2] = {
+static struct hda_channel_mode alc888_3st_hp_modes[3] = {
         { 2, alc888_3st_hp_2ch_init },
+        { 4, alc888_3st_hp_4ch_init },
         { 6, alc888_3st_hp_6ch_init },
 };
 
@@ -8202,7 +8418,7 @@ static void alc888_6st_dell_unsol_event(struct hda_codec *codec,
 {
         switch (res >> 26) {
         case ALC880_HP_EVENT:
-                printk("hp_event\n");
+                /* printk(KERN_DEBUG "hp_event\n"); */
                 alc888_6st_dell_front_automute(codec);
                 break;
         }
@@ -8461,6 +8677,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1019, 0x6668, "ECS", ALC883_3ST_6ch_DIG),
         SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x0090, "Acer Aspire", ALC883_ACER_ASPIRE),
+        SND_PCI_QUIRK(0x1025, 0x010a, "Acer Ferrari 5000", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE),
@@ -8468,17 +8685,21 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
                 ALC888_ACER_ASPIRE_4930G),
         SND_PCI_QUIRK(0x1025, 0x013f, "Acer Aspire 5930G",
                 ALC888_ACER_ASPIRE_4930G),
+        SND_PCI_QUIRK(0x1025, 0x0157, "Acer X3200", ALC883_AUTO),
+        SND_PCI_QUIRK(0x1025, 0x0158, "Acer AX1700-U3700A", ALC883_AUTO),
         SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",
                 ALC888_ACER_ASPIRE_4930G),
         SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G",
                 ALC888_ACER_ASPIRE_4930G),
-        SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
+        /* default Acer */
+        SND_PCI_QUIRK_VENDOR(0x1025, "Acer laptop", ALC883_ACER),
         SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
         SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
         SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP),
         SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP),
         SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG),
         SND_PCI_QUIRK(0x103c, 0x2a66, "HP Acacia", ALC888_3ST_HP),
+        SND_PCI_QUIRK(0x103c, 0x2a72, "HP Educ.ar", ALC888_3ST_HP),
         SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V),
         SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG),
         SND_PCI_QUIRK(0x1043, 0x8284, "Asus Z37E", ALC883_6ST_DIG),
@@ -8518,7 +8739,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x147b, 0x1083, "Abit IP35-PRO", ALC883_6ST_DIG),
         SND_PCI_QUIRK(0x1558, 0x0721, "Clevo laptop M720R", ALC883_CLEVO_M720),
         SND_PCI_QUIRK(0x1558, 0x0722, "Clevo laptop M720SR", ALC883_CLEVO_M720),
-        SND_PCI_QUIRK(0x1558, 0, "Clevo laptop", ALC883_LAPTOP_EAPD),
+        SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC883_LAPTOP_EAPD),
         SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),
         SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),
         SND_PCI_QUIRK(0x1734, 0x1107, "FSC AMILO Xi2550",
@@ -8543,6 +8764,10 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         {}
 };
 
+static hda_nid_t alc1200_slave_dig_outs[] = {
+        ALC883_DIGOUT_NID, 0,
+};
+
 static struct alc_config_preset alc883_presets[] = {
         [ALC883_3ST_2ch_DIG] = {
                 .mixers = { alc883_3ST_2ch_mixer },
@@ -8778,6 +9003,8 @@ static struct alc_config_preset alc883_presets[] = {
                 .channel_mode = alc888_3st_hp_modes,
                 .need_dac_fix = 1,
                 .input_mux = &alc883_capture_source,
+                .unsol_event = alc888_3st_hp_unsol_event,
+                .init_hook = alc888_3st_hp_front_automute,
         },
         [ALC888_6ST_DELL] = {
                 .mixers = { alc883_base_mixer, alc883_chmode_mixer },
@@ -8883,6 +9110,7 @@ static struct alc_config_preset alc883_presets[] = {
                 .dac_nids = alc883_dac_nids,
                 .dig_out_nid = ALC1200_DIGOUT_NID,
                 .dig_in_nid = ALC883_DIGIN_NID,
+                .slave_dig_outs = alc1200_slave_dig_outs,
                 .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
                 .channel_mode = alc883_sixstack_modes,
                 .input_mux = &alc883_capture_source,
@@ -8950,11 +9178,9 @@ static void alc883_auto_init_analog_input(struct hda_codec *codec)
         for (i = 0; i < AUTO_PIN_LAST; i++) {
                 hda_nid_t nid = spec->autocfg.input_pins[i];
                 if (alc883_is_input_pin(nid)) {
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            (i <= AUTO_PIN_FRONT_MIC ?
-                                             PIN_VREF80 : PIN_IN));
-                        if (nid != ALC883_PIN_CD_NID)
+                        alc_set_input_pin(codec, nid, i);
+                        if (nid != ALC883_PIN_CD_NID &&
+                            (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
                                 snd_hda_codec_write(codec, nid, 0,
                                                     AC_VERB_SET_AMP_GAIN_MUTE,
                                                     AMP_OUT_MUTE);
@@ -8969,6 +9195,8 @@ static int alc883_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         int err = alc880_parse_auto_config(codec);
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        int i;
 
         if (err < 0)
                 return err;
@@ -8982,6 +9210,26 @@ static int alc883_parse_auto_config(struct hda_codec *codec)
         /* hack - override the init verbs */
         spec->init_verbs[0] = alc883_auto_init_verbs;
 
+        /* setup input_mux for ALC889 */
+        if (codec->vendor_id == 0x10ec0889) {
+                /* digital-mic input pin is excluded in alc880_auto_create..()
+                 * because it's under 0x18
+                 */
+                if (cfg->input_pins[AUTO_PIN_MIC] == 0x12 ||
+                    cfg->input_pins[AUTO_PIN_FRONT_MIC] == 0x12) {
+                        struct hda_input_mux *imux = &spec->private_imux[0];
+                        for (i = 1; i < 3; i++)
+                                memcpy(&spec->private_imux[i],
+                                       &spec->private_imux[0],
+                                       sizeof(spec->private_imux[0]));
+                        imux->items[imux->num_items].label = "Int DMic";
+                        imux->items[imux->num_items].index = 0x0b;
+                        imux->num_items++;
+                        spec->num_mux_defs = 3;
+                        spec->input_mux = spec->private_imux;
+                }
+        }
+
         return 1; /* config found */
 }
 
@@ -9033,6 +9281,12 @@ static int patch_alc883(struct hda_codec *codec)
                 }
         }
 
+        err = snd_hda_attach_beep_device(codec, 0x1);
+        if (err < 0) {
+                alc_free(codec);
+                return err;
+        }
+
         if (board_config != ALC883_AUTO)
                 setup_preset(spec, &alc883_presets[board_config]);
 
@@ -9045,14 +9299,36 @@ static int patch_alc883(struct hda_codec *codec)
                         spec->stream_name_analog = "ALC888 Analog";
                         spec->stream_name_digital = "ALC888 Digital";
                 }
+                if (!spec->num_adc_nids) {
+                        spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids);
+                        spec->adc_nids = alc883_adc_nids;
+                }
+                if (!spec->capsrc_nids)
+                        spec->capsrc_nids = alc883_capsrc_nids;
+                spec->capture_style = CAPT_MIX; /* matrix-style capture */
                 break;
         case 0x10ec0889:
                 spec->stream_name_analog = "ALC889 Analog";
                 spec->stream_name_digital = "ALC889 Digital";
+                if (!spec->num_adc_nids) {
+                        spec->num_adc_nids = ARRAY_SIZE(alc889_adc_nids);
+                        spec->adc_nids = alc889_adc_nids;
+                }
+                if (!spec->capsrc_nids)
+                        spec->capsrc_nids = alc889_capsrc_nids;
+                spec->capture_style = CAPT_1MUX_MIX; /* 1mux/Nmix-style
+                                                        capture */
                 break;
         default:
                 spec->stream_name_analog = "ALC883 Analog";
                 spec->stream_name_digital = "ALC883 Digital";
+                if (!spec->num_adc_nids) {
+                        spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids);
+                        spec->adc_nids = alc883_adc_nids;
+                }
+                if (!spec->capsrc_nids)
+                        spec->capsrc_nids = alc883_capsrc_nids;
+                spec->capture_style = CAPT_MIX; /* matrix-style capture */
                 break;
         }
 
@@ -9063,15 +9339,9 @@ static int patch_alc883(struct hda_codec *codec)
         spec->stream_digital_playback = &alc883_pcm_digital_playback;
         spec->stream_digital_capture = &alc883_pcm_digital_capture;
 
-        if (!spec->num_adc_nids) {
-                spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids);
-                spec->adc_nids = alc883_adc_nids;
-        }
-        if (!spec->capsrc_nids)
-                spec->capsrc_nids = alc883_capsrc_nids;
-        spec->is_mix_capture = 1; /* matrix-style capture */
         if (!spec->cap_mixer)
                 set_capture_mixer(spec);
+        set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
         spec->vmaster_nid = 0x0c;
 
@@ -9124,8 +9394,6 @@ static struct snd_kcontrol_new alc262_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
-        /* HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x0b, 0x05, HDA_INPUT),
-           HDA_CODEC_MUTE("PC Beep Playback Switch", 0x0b, 0x05, HDA_INPUT), */
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0D, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
@@ -9146,8 +9414,6 @@ static struct snd_kcontrol_new alc262_hippo1_mixer[] = {
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
-        /* HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x0b, 0x05, HDA_INPUT),
-           HDA_CODEC_MUTE("PC Beep Playback Switch", 0x0b, 0x05, HDA_INPUT), */
         /*HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0D, 0x0, HDA_OUTPUT),*/
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
         { } /* end */
@@ -9256,8 +9522,6 @@ static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Beep Playback Switch", 0x0b, 0x05, HDA_INPUT),
         HDA_CODEC_VOLUME("AUX IN Playback Volume", 0x0b, 0x06, HDA_INPUT),
         HDA_CODEC_MUTE("AUX IN Playback Switch", 0x0b, 0x06, HDA_INPUT),
         { } /* end */
@@ -9286,8 +9550,6 @@ static struct snd_kcontrol_new alc262_HP_BPC_WildWest_mixer[] = {
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Beep Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -9435,6 +9697,67 @@ static struct snd_kcontrol_new alc262_benq_t31_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new alc262_tyan_mixer[] = {
+        HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Aux Playback Volume", 0x0b, 0x06, HDA_INPUT),
+        HDA_CODEC_MUTE("Aux Playback Switch", 0x0b, 0x06, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        { } /* end */
+};
+
+static struct hda_verb alc262_tyan_verbs[] = {
+        /* Headphone automute */
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* P11 AUX_IN, white 4-pin connector */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x14, AC_VERB_SET_CONFIG_DEFAULT_BYTES_1, 0xe1},
+        {0x14, AC_VERB_SET_CONFIG_DEFAULT_BYTES_2, 0x93},
+        {0x14, AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, 0x19},
+
+        {}
+};
+
+/* unsolicited event for HP jack sensing */
+static void alc262_tyan_automute(struct hda_codec *codec)
+{
+        unsigned int mute;
+        unsigned int present;
+
+        snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0);
+        present = snd_hda_codec_read(codec, 0x1b, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0);
+        present = (present & 0x80000000) != 0;
+        if (present) {
+                /* mute line output on ATX panel */
+                snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
+        } else {
+                /* unmute line output if necessary */
+                mute = snd_hda_codec_amp_read(codec, 0x1b, 0, HDA_OUTPUT, 0);
+                snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, mute);
+        }
+}
+
+static void alc262_tyan_unsol_event(struct hda_codec *codec,
+                                       unsigned int res)
+{
+        if ((res >> 26) != ALC880_HP_EVENT)
+                return;
+        alc262_tyan_automute(codec);
+}
+
 #define alc262_capture_mixer            alc882_capture_mixer
 #define alc262_capture_alt_mixer        alc882_capture_alt_mixer
 
@@ -9901,8 +10224,6 @@ static struct snd_kcontrol_new alc262_fujitsu_mixer[] = {
         },
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Switch", 0x0b, 0x05, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
@@ -10474,8 +10795,14 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
                                            alc262_ignore);
         if (err < 0)
                 return err;
-        if (!spec->autocfg.line_outs)
+        if (!spec->autocfg.line_outs) {
+                if (spec->autocfg.dig_outs || spec->autocfg.dig_in_pin) {
+                        spec->multiout.max_channels = 2;
+                        spec->no_analog = 1;
+                        goto dig_only;
+                }
                 return 0; /* can't find valid BIOS pin config */
+        }
         err = alc262_auto_create_multi_out_ctls(spec, &spec->autocfg);
         if (err < 0)
                 return err;
@@ -10485,8 +10812,11 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+ dig_only:
+        if (spec->autocfg.dig_outs) {
                 spec->multiout.dig_out_nid = ALC262_DIGOUT_NID;
+                spec->dig_out_type = spec->autocfg.dig_out_type[0];
+        }
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = ALC262_DIGIN_NID;
 
@@ -10495,13 +10825,12 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
 
         add_verb(spec, alc262_volume_init_verbs);
         spec->num_mux_defs = 1;
-        spec->input_mux = &spec->private_imux;
+        spec->input_mux = &spec->private_imux[0];
 
         err = alc_auto_add_mic_boost(codec);
         if (err < 0)
                 return err;
 
-        store_pin_configs(codec);
         return 1;
 }
 
@@ -10543,21 +10872,19 @@ static const char *alc262_models[ALC262_MODEL_LAST] = {
         [ALC262_ULTRA]          = "ultra",
         [ALC262_LENOVO_3000]    = "lenovo-3000",
         [ALC262_NEC]            = "nec",
+        [ALC262_TYAN]           = "tyan",
         [ALC262_AUTO]           = "auto",
 };
 
 static struct snd_pci_quirk alc262_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),
         SND_PCI_QUIRK(0x1033, 0x8895, "NEC Versa S9100", ALC262_NEC),
-        SND_PCI_QUIRK(0x103c, 0x12fe, "HP xw9400", ALC262_HP_BPC),
-        SND_PCI_QUIRK(0x103c, 0x12ff, "HP xw4550", ALC262_HP_BPC),
-        SND_PCI_QUIRK(0x103c, 0x1306, "HP xw8600", ALC262_HP_BPC),
-        SND_PCI_QUIRK(0x103c, 0x1307, "HP xw6600", ALC262_HP_BPC),
-        SND_PCI_QUIRK(0x103c, 0x1308, "HP xw4600", ALC262_HP_BPC),
-        SND_PCI_QUIRK(0x103c, 0x1309, "HP xw4*00", ALC262_HP_BPC),
-        SND_PCI_QUIRK(0x103c, 0x130a, "HP xw6*00", ALC262_HP_BPC),
-        SND_PCI_QUIRK(0x103c, 0x130b, "HP xw8*00", ALC262_HP_BPC),
-        SND_PCI_QUIRK(0x103c, 0x170b, "HP xw*", ALC262_HP_BPC),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1200, "HP xw series",
+                           ALC262_HP_BPC),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1300, "HP xw series",
+                           ALC262_HP_BPC),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1700, "HP xw series",
+                           ALC262_HP_BPC),
         SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),
         SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),
         SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),
@@ -10575,17 +10902,17 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = {
         SND_PCI_QUIRK(0x104d, 0x1f00, "Sony ASSAMD", ALC262_SONY_ASSAMD),
         SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO),
         SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),
-        SND_PCI_QUIRK(0x104d, 0x900e, "Sony ASSAMD", ALC262_SONY_ASSAMD),
-        SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD),
-        SND_PCI_QUIRK(0x104d, 0x9033, "Sony VAIO VGN-SR19XN",
-                      ALC262_SONY_ASSAMD),
+        SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */
+        SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO",
+                           ALC262_SONY_ASSAMD),
         SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
                       ALC262_TOSHIBA_RX1),
         SND_PCI_QUIRK(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06),
         SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU),
         SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),
-        SND_PCI_QUIRK(0x144d, 0xc032, "Samsung Q1 Ultra", ALC262_ULTRA),
-        SND_PCI_QUIRK(0x144d, 0xc039, "Samsung Q1U EL", ALC262_ULTRA),
+        SND_PCI_QUIRK(0x10f1, 0x2915, "Tyan Thunder n6650W", ALC262_TYAN),
+        SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1",
+                           ALC262_ULTRA),
         SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO),
         SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 y410", ALC262_LENOVO_3000),
         SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8),
@@ -10802,6 +11129,19 @@ static struct alc_config_preset alc262_presets[] = {
                 .unsol_event = alc262_hippo_unsol_event,
                 .init_hook = alc262_hippo_automute,
         },
+        [ALC262_TYAN] = {
+                .mixers = { alc262_tyan_mixer },
+                .init_verbs = { alc262_init_verbs, alc262_tyan_verbs},
+                .num_dacs = ARRAY_SIZE(alc262_dac_nids),
+                .dac_nids = alc262_dac_nids,
+                .hp_nid = 0x02,
+                .dig_out_nid = ALC262_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc262_modes),
+                .channel_mode = alc262_modes,
+                .input_mux = &alc262_capture_source,
+                .unsol_event = alc262_tyan_unsol_event,
+                .init_hook = alc262_tyan_automute,
+        },
 };
 
 static int patch_alc262(struct hda_codec *codec)
@@ -10854,6 +11194,14 @@ static int patch_alc262(struct hda_codec *codec)
                 }
         }
 
+        if (!spec->no_analog) {
+                err = snd_hda_attach_beep_device(codec, 0x1);
+                if (err < 0) {
+                        alc_free(codec);
+                        return err;
+                }
+        }
+
         if (board_config != ALC262_AUTO)
                 setup_preset(spec, &alc262_presets[board_config]);
 
@@ -10865,7 +11213,7 @@ static int patch_alc262(struct hda_codec *codec)
         spec->stream_digital_playback = &alc262_pcm_digital_playback;
         spec->stream_digital_capture = &alc262_pcm_digital_capture;
 
-        spec->is_mix_capture = 1;
+        spec->capture_style = CAPT_MIX;
         if (!spec->adc_nids && spec->input_mux) {
                 /* check whether NID 0x07 is valid */
                 unsigned int wcap = get_wcaps(codec, 0x07);
@@ -10882,8 +11230,10 @@ static int patch_alc262(struct hda_codec *codec)
                         spec->capsrc_nids = alc262_capsrc_nids;
                 }
         }
-        if (!spec->cap_mixer)
+        if (!spec->cap_mixer && !spec->no_analog)
                 set_capture_mixer(spec);
+        if (!spec->no_analog)
+                set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
         spec->vmaster_nid = 0x0c;
 
@@ -11263,19 +11613,13 @@ static void alc267_quanta_il1_unsol_event(struct hda_codec *codec,
 static struct hda_verb alc268_base_init_verbs[] = {
         /* Unmute DAC0-1 and set vol = 0 */
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
 
         /*
          * Set up output mixers (0x0c - 0x0e)
          */
         /* set vol=0 to output mixers */
         {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x0e, AC_VERB_SET_CONNECT_SEL, 0x00},
 
         {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -11294,9 +11638,7 @@ static struct hda_verb alc268_base_init_verbs[] = {
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
 
         /* set PCBEEP vol = 0, mute connections */
         {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -11318,10 +11660,8 @@ static struct hda_verb alc268_base_init_verbs[] = {
  */
 static struct hda_verb alc268_volume_init_verbs[] = {
         /* set output DAC */
-        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
 
         {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
         {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
@@ -11329,16 +11669,12 @@ static struct hda_verb alc268_volume_init_verbs[] = {
         {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
         {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
 
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
         {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
 
         /* set PCBEEP vol = 0, mute connections */
         {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -11537,7 +11873,7 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,
 static int alc268_auto_create_analog_input_ctls(struct alc_spec *spec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        struct hda_input_mux *imux = &spec->private_imux;
+        struct hda_input_mux *imux = &spec->private_imux[0];
         int i, idx1;
 
         for (i = 0; i < AUTO_PIN_LAST; i++) {
@@ -11631,9 +11967,14 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
                                            alc268_ignore);
         if (err < 0)
                 return err;
-        if (!spec->autocfg.line_outs)
+        if (!spec->autocfg.line_outs) {
+                if (spec->autocfg.dig_outs || spec->autocfg.dig_in_pin) {
+                        spec->multiout.max_channels = 2;
+                        spec->no_analog = 1;
+                        goto dig_only;
+                }
                 return 0; /* can't find valid BIOS pin config */
-
+        }
         err = alc268_auto_create_multi_out_ctls(spec, &spec->autocfg);
         if (err < 0)
                 return err;
@@ -11643,25 +11984,26 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = 2;
 
+ dig_only:
         /* digital only support output */
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs) {
                 spec->multiout.dig_out_nid = ALC268_DIGOUT_NID;
-
+                spec->dig_out_type = spec->autocfg.dig_out_type[0];
+        }
         if (spec->kctls.list)
                 add_mixer(spec, spec->kctls.list);
 
-        if (spec->autocfg.speaker_pins[0] != 0x1d)
+        if (!spec->no_analog && spec->autocfg.speaker_pins[0] != 0x1d)
                 add_mixer(spec, alc268_beep_mixer);
 
         add_verb(spec, alc268_volume_init_verbs);
         spec->num_mux_defs = 1;
-        spec->input_mux = &spec->private_imux;
+        spec->input_mux = &spec->private_imux[0];
 
         err = alc_auto_add_mic_boost(codec);
         if (err < 0)
                 return err;
 
-        store_pin_configs(codec);
         return 1;
 }
 
@@ -11723,7 +12065,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
 
 static struct alc_config_preset alc268_presets[] = {
         [ALC267_QUANTA_IL1] = {
-                .mixers = { alc267_quanta_il1_mixer },
+                .mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer },
                 .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
                                 alc267_quanta_il1_verbs },
                 .num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -11805,7 +12147,8 @@ static struct alc_config_preset alc268_presets[] = {
         },
         [ALC268_ACER_ASPIRE_ONE] = {
                 .mixers = { alc268_acer_aspire_one_mixer,
-                                alc268_capture_alt_mixer },
+                            alc268_beep_mixer,
+                            alc268_capture_alt_mixer },
                 .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
                                 alc268_acer_aspire_one_verbs },
                 .num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -11874,7 +12217,7 @@ static int patch_alc268(struct hda_codec *codec)
 {
         struct alc_spec *spec;
         int board_config;
-        int err;
+        int i, has_beep, err;
 
         spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -11923,15 +12266,30 @@ static int patch_alc268(struct hda_codec *codec)
 
         spec->stream_digital_playback = &alc268_pcm_digital_playback;
 
-        if (!query_amp_caps(codec, 0x1d, HDA_INPUT))
-                /* override the amp caps for beep generator */
-                snd_hda_override_amp_caps(codec, 0x1d, HDA_INPUT,
+        has_beep = 0;
+        for (i = 0; i < spec->num_mixers; i++) {
+                if (spec->mixers[i] == alc268_beep_mixer) {
+                        has_beep = 1;
+                        break;
+                }
+        }
+
+        if (has_beep) {
+                err = snd_hda_attach_beep_device(codec, 0x1);
+                if (err < 0) {
+                        alc_free(codec);
+                        return err;
+                }
+                if (!query_amp_caps(codec, 0x1d, HDA_INPUT))
+                        /* override the amp caps for beep generator */
+                        snd_hda_override_amp_caps(codec, 0x1d, HDA_INPUT,
                                           (0x0c << AC_AMPCAP_OFFSET_SHIFT) |
                                           (0x0c << AC_AMPCAP_NUM_STEPS_SHIFT) |
                                           (0x07 << AC_AMPCAP_STEP_SIZE_SHIFT) |
                                           (0 << AC_AMPCAP_MUTE_SHIFT));
+        }
 
-        if (!spec->adc_nids && spec->input_mux) {
+        if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
                 /* check whether NID 0x07 is valid */
                 unsigned int wcap = get_wcaps(codec, 0x07);
                 int i;
@@ -12012,8 +12370,6 @@ static struct snd_kcontrol_new alc269_base_mixer[] = {
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x0b, 0x4, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x0b, 0x4, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
@@ -12040,8 +12396,6 @@ static struct snd_kcontrol_new alc269_quanta_fl1_mixer[] = {
         HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x04, HDA_INPUT),
         { }
 };
 
@@ -12065,8 +12419,6 @@ static struct snd_kcontrol_new alc269_lifebook_mixer[] = {
         HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x0b, 0x03, HDA_INPUT),
         HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x0b, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("Dock Mic Boost", 0x1b, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x04, HDA_INPUT),
         { }
 };
 
@@ -12103,13 +12455,6 @@ static struct snd_kcontrol_new alc269_fujitsu_mixer[] = {
         { } /* end */
 };
 
-/* beep control */
-static struct snd_kcontrol_new alc269_beep_mixer[] = {
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x0b, 0x4, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x0b, 0x4, HDA_INPUT),
-        { } /* end */
-};
-
 static struct hda_verb alc269_quanta_fl1_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
@@ -12509,7 +12854,7 @@ static int alc269_auto_create_analog_input_ctls(struct alc_spec *spec,
          */
         if (cfg->input_pins[AUTO_PIN_MIC] == 0x12 ||
             cfg->input_pins[AUTO_PIN_FRONT_MIC] == 0x12) {
-                struct hda_input_mux *imux = &spec->private_imux;
+                struct hda_input_mux *imux = &spec->private_imux[0];
                 imux->items[imux->num_items].label = "Int Mic";
                 imux->items[imux->num_items].index = 0x05;
                 imux->num_items++;
@@ -12527,13 +12872,34 @@ static int alc269_auto_create_analog_input_ctls(struct alc_spec *spec,
 #define alc269_pcm_digital_playback     alc880_pcm_digital_playback
 #define alc269_pcm_digital_capture      alc880_pcm_digital_capture
 
+static struct hda_pcm_stream alc269_44k_pcm_analog_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 8,
+        .rates = SNDRV_PCM_RATE_44100, /* fixed rate */
+        /* NID is set in alc_build_pcms */
+        .ops = {
+                .open = alc880_playback_pcm_open,
+                .prepare = alc880_playback_pcm_prepare,
+                .cleanup = alc880_playback_pcm_cleanup
+        },
+};
+
+static struct hda_pcm_stream alc269_44k_pcm_analog_capture = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        .rates = SNDRV_PCM_RATE_44100, /* fixed rate */
+        /* NID is set in alc_build_pcms */
+};
+
 /*
  * BIOS auto configuration
  */
 static int alc269_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        int i, err;
+        int err;
         static hda_nid_t alc269_ignore[] = { 0x1d, 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
@@ -12550,22 +12916,15 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = ALC269_DIGOUT_NID;
 
         if (spec->kctls.list)
                 add_mixer(spec, spec->kctls.list);
 
-        /* create a beep mixer control if the pin 0x1d isn't assigned */
-        for (i = 0; i < ARRAY_SIZE(spec->autocfg.input_pins); i++)
-                if (spec->autocfg.input_pins[i] == 0x1d)
-                        break;
-        if (i >= ARRAY_SIZE(spec->autocfg.input_pins))
-                add_mixer(spec, alc269_beep_mixer);
-
         add_verb(spec, alc269_init_verbs);
         spec->num_mux_defs = 1;
-        spec->input_mux = &spec->private_imux;
+        spec->input_mux = &spec->private_imux[0];
         /* set default input source */
         snd_hda_codec_write_cache(codec, alc269_capsrc_nids[0],
                                   0, AC_VERB_SET_CONNECT_SEL,
@@ -12575,10 +12934,9 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
-        if (!spec->cap_mixer)
+        if (!spec->cap_mixer && !spec->no_analog)
                 set_capture_mixer(spec);
 
-        store_pin_configs(codec);
         return 1;
 }
 
@@ -12675,7 +13033,7 @@ static struct alc_config_preset alc269_presets[] = {
                 .init_hook = alc269_eeepc_dmic_inithook,
         },
         [ALC269_FUJITSU] = {
-                .mixers = { alc269_fujitsu_mixer, alc269_beep_mixer },
+                .mixers = { alc269_fujitsu_mixer },
                 .cap_mixer = alc269_epc_capture_mixer,
                 .init_verbs = { alc269_init_verbs,
                                 alc269_eeepc_dmic_init_verbs },
@@ -12740,13 +13098,26 @@ static int patch_alc269(struct hda_codec *codec)
                 }
         }
 
+        err = snd_hda_attach_beep_device(codec, 0x1);
+        if (err < 0) {
+                alc_free(codec);
+                return err;
+        }
+
         if (board_config != ALC269_AUTO)
                 setup_preset(spec, &alc269_presets[board_config]);
 
         spec->stream_name_analog = "ALC269 Analog";
-        spec->stream_analog_playback = &alc269_pcm_analog_playback;
-        spec->stream_analog_capture = &alc269_pcm_analog_capture;
-
+        if (codec->subsystem_id == 0x17aa3bf8) {
+                /* Due to a hardware problem on Lenovo Ideadpad, we need to
+                 * fix the sample rate of analog I/O to 44.1kHz
+                 */
+                spec->stream_analog_playback = &alc269_44k_pcm_analog_playback;
+                spec->stream_analog_capture = &alc269_44k_pcm_analog_capture;
+        } else {
+                spec->stream_analog_playback = &alc269_pcm_analog_playback;
+                spec->stream_analog_capture = &alc269_pcm_analog_capture;
+        }
         spec->stream_name_digital = "ALC269 Digital";
         spec->stream_digital_playback = &alc269_pcm_digital_playback;
         spec->stream_digital_capture = &alc269_pcm_digital_capture;
@@ -12756,6 +13127,7 @@ static int patch_alc269(struct hda_codec *codec)
         spec->capsrc_nids = alc269_capsrc_nids;
         if (!spec->cap_mixer)
                 set_capture_mixer(spec);
+        set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
 
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC269_AUTO)
@@ -13006,8 +13378,6 @@ static struct snd_kcontrol_new alc861_asus_mixer[] = {
 static struct snd_kcontrol_new alc861_asus_laptop_mixer[] = {
         HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x23, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("PC Beep Playback Switch", 0x23, 0x0, HDA_OUTPUT),
         { }
 };
 
@@ -13481,7 +13851,7 @@ static int alc861_auto_create_hp_ctls(struct alc_spec *spec, hda_nid_t pin)
 static int alc861_auto_create_analog_input_ctls(struct alc_spec *spec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        struct hda_input_mux *imux = &spec->private_imux;
+        struct hda_input_mux *imux = &spec->private_imux[0];
         int i, err, idx, idx1;
 
         for (i = 0; i < AUTO_PIN_LAST; i++) {
@@ -13568,12 +13938,8 @@ static void alc861_auto_init_analog_input(struct hda_codec *codec)
 
         for (i = 0; i < AUTO_PIN_LAST; i++) {
                 hda_nid_t nid = spec->autocfg.input_pins[i];
-                if (nid >= 0x0c && nid <= 0x11) {
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            i <= AUTO_PIN_FRONT_MIC ?
-                                            PIN_VREF80 : PIN_IN);
-                }
+                if (nid >= 0x0c && nid <= 0x11)
+                        alc_set_input_pin(codec, nid, i);
         }
 }
 
@@ -13609,7 +13975,7 @@ static int alc861_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = ALC861_DIGOUT_NID;
 
         if (spec->kctls.list)
@@ -13618,13 +13984,12 @@ static int alc861_parse_auto_config(struct hda_codec *codec)
         add_verb(spec, alc861_auto_init_verbs);
 
         spec->num_mux_defs = 1;
-        spec->input_mux = &spec->private_imux;
+        spec->input_mux = &spec->private_imux[0];
 
         spec->adc_nids = alc861_adc_nids;
         spec->num_adc_nids = ARRAY_SIZE(alc861_adc_nids);
         set_capture_mixer(spec);
 
-        store_pin_configs(codec);
         return 1;
 }
 
@@ -13833,6 +14198,12 @@ static int patch_alc861(struct hda_codec *codec)
                 }
         }
 
+        err = snd_hda_attach_beep_device(codec, 0x23);
+        if (err < 0) {
+                alc_free(codec);
+                return err;
+        }
+
         if (board_config != ALC861_AUTO)
                 setup_preset(spec, &alc861_presets[board_config]);
 
@@ -13844,6 +14215,8 @@ static int patch_alc861(struct hda_codec *codec)
         spec->stream_digital_playback = &alc861_pcm_digital_playback;
         spec->stream_digital_capture = &alc861_pcm_digital_capture;
 
+        set_beep_amp(spec, 0x23, 0, HDA_OUTPUT);
+
         spec->vmaster_nid = 0x03;
 
         codec->patch_ops = alc_patch_ops;
@@ -14000,9 +14373,6 @@ static struct snd_kcontrol_new alc861vd_6st_mixer[] = {
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
 
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-
         { } /* end */
 };
 
@@ -14026,9 +14396,6 @@ static struct snd_kcontrol_new alc861vd_3st_mixer[] = {
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
 
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-
         { } /* end */
 };
 
@@ -14067,8 +14434,6 @@ static struct snd_kcontrol_new alc861vd_dallas_mixer[] = {
         HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Beep Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Beep Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -14379,9 +14744,7 @@ static struct snd_pci_quirk alc861vd_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1179, 0xff03, "Toshiba P205", ALC861VD_LENOVO),
         SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba L30-149", ALC861VD_DALLAS),
         SND_PCI_QUIRK(0x1565, 0x820d, "Biostar NF61S SE", ALC861VD_6ST_DIG),
-        SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo", ALC861VD_LENOVO),
-        SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo 3000 C200", ALC861VD_LENOVO),
-        SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 N200", ALC861VD_LENOVO),
+        SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", ALC861VD_LENOVO),
         SND_PCI_QUIRK(0x1849, 0x0862, "ASRock K8NF6G-VSTA", ALC861VD_6ST_DIG),
         {}
 };
@@ -14543,11 +14906,9 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec)
         for (i = 0; i < AUTO_PIN_LAST; i++) {
                 hda_nid_t nid = spec->autocfg.input_pins[i];
                 if (alc861vd_is_input_pin(nid)) {
-                        snd_hda_codec_write(codec, nid, 0,
-                                        AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                        i <= AUTO_PIN_FRONT_MIC ?
-                                                        PIN_VREF80 : PIN_IN);
-                        if (nid != ALC861VD_PIN_CD_NID)
+                        alc_set_input_pin(codec, nid, i);
+                        if (nid != ALC861VD_PIN_CD_NID &&
+                            (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
                                 snd_hda_codec_write(codec, nid, 0,
                                                 AC_VERB_SET_AMP_GAIN_MUTE,
                                                 AMP_OUT_MUTE);
@@ -14713,7 +15074,7 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = ALC861VD_DIGOUT_NID;
 
         if (spec->kctls.list)
@@ -14722,13 +15083,12 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec)
         add_verb(spec, alc861vd_volume_init_verbs);
 
         spec->num_mux_defs = 1;
-        spec->input_mux = &spec->private_imux;
+        spec->input_mux = &spec->private_imux[0];
 
         err = alc_auto_add_mic_boost(codec);
         if (err < 0)
                 return err;
 
-        store_pin_configs(codec);
         return 1;
 }
 
@@ -14779,6 +15139,12 @@ static int patch_alc861vd(struct hda_codec *codec)
                 }
         }
 
+        err = snd_hda_attach_beep_device(codec, 0x23);
+        if (err < 0) {
+                alc_free(codec);
+                return err;
+        }
+
         if (board_config != ALC861VD_AUTO)
                 setup_preset(spec, &alc861vd_presets[board_config]);
 
@@ -14801,9 +15167,10 @@ static int patch_alc861vd(struct hda_codec *codec)
         spec->adc_nids = alc861vd_adc_nids;
         spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids);
         spec->capsrc_nids = alc861vd_capsrc_nids;
-        spec->is_mix_capture = 1;
+        spec->capture_style = CAPT_MIX;
 
         set_capture_mixer(spec);
+        set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
         spec->vmaster_nid = 0x02;
 
@@ -14992,8 +15359,6 @@ static struct snd_kcontrol_new alc662_3ST_2ch_mixer[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -15015,8 +15380,6 @@ static struct snd_kcontrol_new alc662_3ST_6ch_mixer[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -15992,56 +16355,55 @@ static const char *alc662_models[ALC662_MODEL_LAST] = {
 };
 
 static struct snd_pci_quirk alc662_cfg_tbl[] = {
-        SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M51VA", ALC663_ASUS_M51VA),
-        SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS G50V", ALC663_ASUS_G50V),
-        SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG),
-        SND_PCI_QUIRK(0x1043, 0x82a1, "ASUS Eeepc", ALC662_ASUS_EEEPC_P701),
-        SND_PCI_QUIRK(0x1043, 0x82d1, "ASUS Eeepc EP20", ALC662_ASUS_EEEPC_EP20),
-        SND_PCI_QUIRK(0x1043, 0x1903, "ASUS F5GL", ALC663_ASUS_MODE1),
-        SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M50Vr", ALC663_ASUS_MODE1),
+        SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_ECS),
         SND_PCI_QUIRK(0x1043, 0x1000, "ASUS N50Vm", ALC663_ASUS_MODE1),
-        SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS F7Z", ALC663_ASUS_MODE1),
-        SND_PCI_QUIRK(0x1043, 0x1953, "ASUS NB", ALC663_ASUS_MODE1),
-        SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS NB", ALC663_ASUS_MODE1),
+        SND_PCI_QUIRK(0x1043, 0x1092, "ASUS NB", ALC663_ASUS_MODE3),
+        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, 0x19e3, "ASUS NB", ALC663_ASUS_MODE1),
-        SND_PCI_QUIRK(0x1043, 0x1993, "ASUS N20", ALC663_ASUS_MODE1),
-        SND_PCI_QUIRK(0x1043, 0x19c3, "ASUS F5Z/F6x", ALC662_ASUS_MODE2),
         SND_PCI_QUIRK(0x1043, 0x1339, "ASUS NB", ALC662_ASUS_MODE2),
-        SND_PCI_QUIRK(0x1043, 0x1913, "ASUS NB", ALC662_ASUS_MODE2),
-        SND_PCI_QUIRK(0x1043, 0x1843, "ASUS NB", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x16c3, "ASUS NB", ALC662_ASUS_MODE2),
+        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, 0x1813, "ASUS NB", ALC662_ASUS_MODE2),
-        SND_PCI_QUIRK(0x1043, 0x11f3, "ASUS NB", ALC662_ASUS_MODE2),
-        SND_PCI_QUIRK(0x1043, 0x1876, "ASUS NB", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x1823, "ASUS NB", ALC663_ASUS_MODE5),
+        SND_PCI_QUIRK(0x1043, 0x1833, "ASUS NB", ALC663_ASUS_MODE6),
+        SND_PCI_QUIRK(0x1043, 0x1843, "ASUS NB", ALC662_ASUS_MODE2),
         SND_PCI_QUIRK(0x1043, 0x1864, "ASUS NB", ALC662_ASUS_MODE2),
-        SND_PCI_QUIRK(0x1043, 0x1783, "ASUS NB", ALC662_ASUS_MODE2),
-        SND_PCI_QUIRK(0x1043, 0x1753, "ASUS NB", ALC662_ASUS_MODE2),
-        SND_PCI_QUIRK(0x1043, 0x16c3, "ASUS NB", ALC662_ASUS_MODE2),
-        SND_PCI_QUIRK(0x1043, 0x1933, "ASUS F80Q", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x1876, "ASUS NB", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M51VA", ALC663_ASUS_M51VA),
+        /*SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M50Vr", ALC663_ASUS_MODE1),*/
         SND_PCI_QUIRK(0x1043, 0x1893, "ASUS M50Vm", ALC663_ASUS_MODE3),
-        SND_PCI_QUIRK(0x1043, 0x11c3, "ASUS M70V", ALC663_ASUS_MODE3),
-        SND_PCI_QUIRK(0x1043, 0x1963, "ASUS X71C", ALC663_ASUS_MODE3),
         SND_PCI_QUIRK(0x1043, 0x1894, "ASUS X55", ALC663_ASUS_MODE3),
-        SND_PCI_QUIRK(0x1043, 0x1092, "ASUS NB", ALC663_ASUS_MODE3),
+        SND_PCI_QUIRK(0x1043, 0x1903, "ASUS F5GL", ALC663_ASUS_MODE1),
+        SND_PCI_QUIRK(0x1043, 0x1913, "ASUS NB", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x1933, "ASUS F80Q", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x1953, "ASUS NB", ALC663_ASUS_MODE1),
+        SND_PCI_QUIRK(0x1043, 0x1963, "ASUS X71C", ALC663_ASUS_MODE3),
+        SND_PCI_QUIRK(0x1043, 0x1993, "ASUS N20", ALC663_ASUS_MODE1),
+        SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS G50V", ALC663_ASUS_G50V),
+        /*SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS NB", ALC663_ASUS_MODE1),*/
+        SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS F7Z", ALC663_ASUS_MODE1),
+        SND_PCI_QUIRK(0x1043, 0x19c3, "ASUS F5Z/F6x", ALC662_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1043, 0x19e3, "ASUS NB", ALC663_ASUS_MODE1),
         SND_PCI_QUIRK(0x1043, 0x19f3, "ASUS NB", ALC663_ASUS_MODE4),
-        SND_PCI_QUIRK(0x1043, 0x1823, "ASUS NB", ALC663_ASUS_MODE5),
-        SND_PCI_QUIRK(0x1043, 0x1833, "ASUS NB", ALC663_ASUS_MODE6),
-        SND_PCI_QUIRK(0x1043, 0x1763, "ASUS NB", ALC663_ASUS_MODE6),
-        SND_PCI_QUIRK(0x1043, 0x1765, "ASUS NB", ALC663_ASUS_MODE6),
+        SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG),
+        SND_PCI_QUIRK(0x1043, 0x82a1, "ASUS Eeepc", ALC662_ASUS_EEEPC_P701),
+        SND_PCI_QUIRK(0x1043, 0x82d1, "ASUS Eeepc EP20", ALC662_ASUS_EEEPC_EP20),
+        SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_ECS),
         SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K",
                       ALC662_3ST_6ch_DIG),
-        SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo", ALC662_LENOVO_101E),
-        SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_ECS),
-        SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_ECS),
         SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L",
                       ALC662_3ST_6ch_DIG),
         SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
+        SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo", ALC662_LENOVO_101E),
         SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0",
                                         ALC662_3ST_6ch_DIG),
-        SND_PCI_QUIRK(0x1854, 0x2000, "ASUS H13-2000", ALC663_ASUS_H13),
-        SND_PCI_QUIRK(0x1854, 0x2001, "ASUS H13-2001", ALC663_ASUS_H13),
-        SND_PCI_QUIRK(0x1854, 0x2002, "ASUS H13-2002", ALC663_ASUS_H13),
+        SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x",
+                           ALC663_ASUS_H13),
         {}
 };
 
@@ -16361,7 +16723,7 @@ static int alc662_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin,
 
         if (alc880_is_fixed_pin(pin)) {
                 nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));
-                /* printk("DAC nid=%x\n",nid); */
+                /* printk(KERN_DEBUG "DAC nid=%x\n",nid); */
                 /* specify the DAC as the extra output */
                 if (!spec->multiout.hp_nid)
                         spec->multiout.hp_nid = nid;
@@ -16391,26 +16753,58 @@ static int alc662_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin,
         return 0;
 }
 
+/* return the index of the src widget from the connection list of the nid.
+ * return -1 if not found
+ */
+static int alc662_input_pin_idx(struct hda_codec *codec, hda_nid_t nid,
+                                hda_nid_t src)
+{
+        hda_nid_t conn_list[HDA_MAX_CONNECTIONS];
+        int i, conns;
+
+        conns = snd_hda_get_connections(codec, nid, conn_list,
+                                        ARRAY_SIZE(conn_list));
+        if (conns < 0)
+                return -1;
+        for (i = 0; i < conns; i++)
+                if (conn_list[i] == src)
+                        return i;
+        return -1;
+}
+
+static int alc662_is_input_pin(struct hda_codec *codec, hda_nid_t nid)
+{
+        unsigned int pincap = snd_hda_query_pin_caps(codec, nid);
+        return (pincap & AC_PINCAP_IN) != 0;
+}
+
 /* create playback/capture controls for input pins */
-static int alc662_auto_create_analog_input_ctls(struct alc_spec *spec,
+static int alc662_auto_create_analog_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        struct hda_input_mux *imux = &spec->private_imux;
+        struct alc_spec *spec = codec->spec;
+        struct hda_input_mux *imux = &spec->private_imux[0];
         int i, err, idx;
 
         for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (alc880_is_input_pin(cfg->input_pins[i])) {
-                        idx = alc880_input_pin_idx(cfg->input_pins[i]);
-                        err = new_analog_input(spec, cfg->input_pins[i],
-                                               auto_pin_cfg_labels[i],
-                                               idx, 0x0b);
-                        if (err < 0)
-                                return err;
-                        imux->items[imux->num_items].label =
-                                auto_pin_cfg_labels[i];
-                        imux->items[imux->num_items].index =
-                                alc880_input_pin_idx(cfg->input_pins[i]);
-                        imux->num_items++;
+                if (alc662_is_input_pin(codec, cfg->input_pins[i])) {
+                        idx = alc662_input_pin_idx(codec, 0x0b,
+                                                   cfg->input_pins[i]);
+                        if (idx >= 0) {
+                                err = new_analog_input(spec, cfg->input_pins[i],
+                                                       auto_pin_cfg_labels[i],
+                                                       idx, 0x0b);
+                                if (err < 0)
+                                        return err;
+                        }
+                        idx = alc662_input_pin_idx(codec, 0x22,
+                                                   cfg->input_pins[i]);
+                        if (idx >= 0) {
+                                imux->items[imux->num_items].label =
+                                        auto_pin_cfg_labels[i];
+                                imux->items[imux->num_items].index = idx;
+                                imux->num_items++;
+                        }
                 }
         }
         return 0;
@@ -16460,7 +16854,6 @@ static void alc662_auto_init_hp_out(struct hda_codec *codec)
                 alc662_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
 }
 
-#define alc662_is_input_pin(nid)        alc880_is_input_pin(nid)
 #define ALC662_PIN_CD_NID               ALC880_PIN_CD_NID
 
 static void alc662_auto_init_analog_input(struct hda_codec *codec)
@@ -16470,12 +16863,10 @@ static void alc662_auto_init_analog_input(struct hda_codec *codec)
 
         for (i = 0; i < AUTO_PIN_LAST; i++) {
                 hda_nid_t nid = spec->autocfg.input_pins[i];
-                if (alc662_is_input_pin(nid)) {
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            (i <= AUTO_PIN_FRONT_MIC ?
-                                             PIN_VREF80 : PIN_IN));
-                        if (nid != ALC662_PIN_CD_NID)
+                if (alc662_is_input_pin(codec, nid)) {
+                        alc_set_input_pin(codec, nid, i);
+                        if (nid != ALC662_PIN_CD_NID &&
+                            (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
                                 snd_hda_codec_write(codec, nid, 0,
                                                     AC_VERB_SET_AMP_GAIN_MUTE,
                                                     AMP_OUT_MUTE);
@@ -16513,20 +16904,20 @@ static int alc662_parse_auto_config(struct hda_codec *codec)
                                            "Headphone");
         if (err < 0)
                 return err;
-        err = alc662_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        err = alc662_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
 
         if (spec->kctls.list)
                 add_mixer(spec, spec->kctls.list);
 
         spec->num_mux_defs = 1;
-        spec->input_mux = &spec->private_imux;
+        spec->input_mux = &spec->private_imux[0];
 
         add_verb(spec, alc662_auto_init_verbs);
         if (codec->vendor_id == 0x10ec0663)
@@ -16536,7 +16927,6 @@ static int alc662_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
-        store_pin_configs(codec);
         return 1;
 }
 
@@ -16588,6 +16978,12 @@ static int patch_alc662(struct hda_codec *codec)
                 }
         }
 
+        err = snd_hda_attach_beep_device(codec, 0x1);
+        if (err < 0) {
+                alc_free(codec);
+                return err;
+        }
+
         if (board_config != ALC662_AUTO)
                 setup_preset(spec, &alc662_presets[board_config]);
 
@@ -16611,10 +17007,14 @@ static int patch_alc662(struct hda_codec *codec)
         spec->adc_nids = alc662_adc_nids;
         spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids);
         spec->capsrc_nids = alc662_capsrc_nids;
-        spec->is_mix_capture = 1;
+        spec->capture_style = CAPT_MIX;
 
         if (!spec->cap_mixer)
                 set_capture_mixer(spec);
+        if (codec->vendor_id == 0x10ec0662)
+                set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
+        else
+                set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
 
         spec->vmaster_nid = 0x02;
 
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 6094344fb223..b5e108aa8f63 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -43,6 +43,7 @@ enum {
 };
 
 enum {
+        STAC_AUTO,
         STAC_REF,
         STAC_9200_OQO,
         STAC_9200_DELL_D21,
@@ -62,14 +63,17 @@ enum {
 };
 
 enum {
+        STAC_9205_AUTO,
         STAC_9205_REF,
         STAC_9205_DELL_M42,
         STAC_9205_DELL_M43,
         STAC_9205_DELL_M44,
+        STAC_9205_EAPD,
         STAC_9205_MODELS
 };
 
 enum {
+        STAC_92HD73XX_AUTO,
         STAC_92HD73XX_NO_JD, /* no jack-detection */
         STAC_92HD73XX_REF,
         STAC_DELL_M6_AMIC,
@@ -80,22 +84,27 @@ enum {
 };
 
 enum {
+        STAC_92HD83XXX_AUTO,
         STAC_92HD83XXX_REF,
         STAC_92HD83XXX_PWR_REF,
+        STAC_DELL_S14,
         STAC_92HD83XXX_MODELS
 };
 
 enum {
+        STAC_92HD71BXX_AUTO,
         STAC_92HD71BXX_REF,
         STAC_DELL_M4_1,
         STAC_DELL_M4_2,
         STAC_DELL_M4_3,
         STAC_HP_M4,
         STAC_HP_DV5,
+        STAC_HP_HDX,
         STAC_92HD71BXX_MODELS
 };
 
 enum {
+        STAC_925x_AUTO,
         STAC_925x_REF,
         STAC_M1,
         STAC_M1_2,
@@ -108,6 +117,7 @@ enum {
 };
 
 enum {
+        STAC_922X_AUTO,
         STAC_D945_REF,
         STAC_D945GTP3,
         STAC_D945GTP5,
@@ -135,6 +145,7 @@ enum {
 };
 
 enum {
+        STAC_927X_AUTO,
         STAC_D965_REF_NO_JD, /* no jack-detection */
         STAC_D965_REF,
         STAC_D965_3ST,
@@ -144,6 +155,12 @@ enum {
         STAC_927X_MODELS
 };
 
+enum {
+        STAC_9872_AUTO,
+        STAC_9872_VAIO,
+        STAC_9872_MODELS
+};
+
 struct sigmatel_event {
         hda_nid_t nid;
         unsigned char type;
@@ -167,6 +184,7 @@ struct sigmatel_spec {
         unsigned int alt_switch: 1;
         unsigned int hp_detect: 1;
         unsigned int spdif_mute: 1;
+        unsigned int check_volume_offset:1;
 
         /* gpio lines */
         unsigned int eapd_mask;
@@ -179,6 +197,7 @@ struct sigmatel_spec {
         unsigned int stream_delay;
 
         /* analog loopback */
+        struct snd_kcontrol_new *aloopback_ctl;
         unsigned char aloopback_mask;
         unsigned char aloopback_shift;
 
@@ -203,6 +222,8 @@ struct sigmatel_spec {
         hda_nid_t hp_dacs[5];
         hda_nid_t speaker_dacs[5];
 
+        int volume_offset;
+
         /* capture */
         hda_nid_t *adc_nids;
         unsigned int num_adcs;
@@ -224,7 +245,6 @@ struct sigmatel_spec {
         /* pin widgets */
         hda_nid_t *pin_nids;
         unsigned int num_pins;
-        unsigned int *pin_configs;
 
         /* codec specific stuff */
         struct hda_verb *init;
@@ -400,6 +420,10 @@ static hda_nid_t stac922x_mux_nids[2] = {
         0x12, 0x13,
 };
 
+static hda_nid_t stac927x_slave_dig_outs[2] = {
+        0x1f, 0,
+};
+
 static hda_nid_t stac927x_adc_nids[3] = {
         0x07, 0x08, 0x09
 };
@@ -472,15 +496,21 @@ static hda_nid_t stac92hd73xx_pin_nids[13] = {
         0x14, 0x22, 0x23
 };
 
-static hda_nid_t stac92hd83xxx_pin_nids[14] = {
+static hda_nid_t stac92hd83xxx_pin_nids[10] = {
         0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
-        0x0f, 0x10, 0x11, 0x12, 0x13,
-        0x1d, 0x1e, 0x1f, 0x20
+        0x0f, 0x10, 0x11, 0x1f, 0x20,
+};
+
+#define STAC92HD71BXX_NUM_PINS 13
+static hda_nid_t stac92hd71bxx_pin_nids_4port[STAC92HD71BXX_NUM_PINS] = {
+        0x0a, 0x0b, 0x0c, 0x0d, 0x00,
+        0x00, 0x14, 0x18, 0x19, 0x1e,
+        0x1f, 0x20, 0x27
 };
-static hda_nid_t stac92hd71bxx_pin_nids[11] = {
+static hda_nid_t stac92hd71bxx_pin_nids_6port[STAC92HD71BXX_NUM_PINS] = {
         0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
         0x0f, 0x14, 0x18, 0x19, 0x1e,
-        0x1f,
+        0x1f, 0x20, 0x27
 };
 
 static hda_nid_t stac927x_pin_nids[14] = {
@@ -842,9 +872,9 @@ static struct hda_verb stac92hd73xx_10ch_core_init[] = {
 };
 
 static struct hda_verb stac92hd83xxx_core_init[] = {
-        { 0xa, AC_VERB_SET_CONNECT_SEL, 0x0},
-        { 0xb, AC_VERB_SET_CONNECT_SEL, 0x0},
-        { 0xd, AC_VERB_SET_CONNECT_SEL, 0x1},
+        { 0xa, AC_VERB_SET_CONNECT_SEL, 0x1},
+        { 0xb, AC_VERB_SET_CONNECT_SEL, 0x1},
+        { 0xd, AC_VERB_SET_CONNECT_SEL, 0x0},
 
         /* power state controls amps */
         { 0x01, AC_VERB_SET_EAPD, 1 << 2},
@@ -854,26 +884,25 @@ static struct hda_verb stac92hd83xxx_core_init[] = {
 static struct hda_verb stac92hd71bxx_core_init[] = {
         /* set master volume and direct control */
         { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
-        /* unmute right and left channels for nodes 0x0a, 0xd, 0x0f */
-        { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {}
 };
 
-#define HD_DISABLE_PORTF 2
+#define HD_DISABLE_PORTF 1
 static struct hda_verb stac92hd71bxx_analog_core_init[] = {
         /* start of config #1 */
 
         /* connect port 0f to audio mixer */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2},
-        /* unmute right and left channels for node 0x0f */
-        { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* start of config #2 */
 
         /* set master volume and direct control */
         { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
-        /* unmute right and left channels for nodes 0x0a, 0xd */
+        {}
+};
+
+static struct hda_verb stac92hd71bxx_unmute_core_init[] = {
+        /* unmute right and left channels for nodes 0x0f, 0xa, 0x0d */
+        { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {}
@@ -954,16 +983,6 @@ static struct hda_verb stac9205_core_init[] = {
                 .private_value = HDA_COMPOSE_AMP_VAL(nid, chs, idx, dir) \
         }
 
-#define STAC_INPUT_SOURCE(cnt) \
-        { \
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-                .name = "Input Source", \
-                .count = cnt, \
-                .info = stac92xx_mux_enum_info, \
-                .get = stac92xx_mux_enum_get, \
-                .put = stac92xx_mux_enum_put, \
-        }
-
 #define STAC_ANALOG_LOOPBACK(verb_read, verb_write, cnt) \
         { \
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
@@ -978,7 +997,6 @@ static struct hda_verb stac9205_core_init[] = {
 static struct snd_kcontrol_new stac9200_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0xb, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0xb, 0, HDA_OUTPUT),
-        STAC_INPUT_SOURCE(1),
         HDA_CODEC_VOLUME("Capture Volume", 0x0a, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0a, 0, HDA_OUTPUT),
         { } /* end */
@@ -1003,8 +1021,6 @@ static struct snd_kcontrol_new stac92hd73xx_6ch_mixer[] = {
         HDA_CODEC_VOLUME("DAC Mixer Capture Volume", 0x1d, 0x3, HDA_INPUT),
         HDA_CODEC_MUTE("DAC Mixer Capture Switch", 0x1d, 0x3, HDA_INPUT),
 
-        STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 3),
-
         HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x20, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x20, 0x0, HDA_OUTPUT),
 
@@ -1014,9 +1030,22 @@ static struct snd_kcontrol_new stac92hd73xx_6ch_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new stac92hd73xx_8ch_mixer[] = {
+static struct snd_kcontrol_new stac92hd73xx_6ch_loopback[] = {
+        STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 3),
+        {}
+};
+
+static struct snd_kcontrol_new stac92hd73xx_8ch_loopback[] = {
         STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 4),
+        {}
+};
 
+static struct snd_kcontrol_new stac92hd73xx_10ch_loopback[] = {
+        STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 5),
+        {}
+};
+
+static struct snd_kcontrol_new stac92hd73xx_8ch_mixer[] = {
         HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x20, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x20, 0x0, HDA_OUTPUT),
 
@@ -1041,8 +1070,6 @@ static struct snd_kcontrol_new stac92hd73xx_8ch_mixer[] = {
 };
 
 static struct snd_kcontrol_new stac92hd73xx_10ch_mixer[] = {
-        STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 5),
-
         HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x20, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x20, 0x0, HDA_OUTPUT),
 
@@ -1094,9 +1121,6 @@ static struct snd_kcontrol_new stac92hd83xxx_mixer[] = {
 };
 
 static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = {
-        STAC_INPUT_SOURCE(2),
-        STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2),
-
         HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT),
 
@@ -1122,10 +1146,11 @@ static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {
-        STAC_INPUT_SOURCE(2),
-        STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2),
+static struct snd_kcontrol_new stac92hd71bxx_loopback[] = {
+        STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2)
+};
 
+static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {
         HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT),
 
@@ -1137,16 +1162,12 @@ static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {
 static struct snd_kcontrol_new stac925x_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x0e, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0x0e, 0, HDA_OUTPUT),
-        STAC_INPUT_SOURCE(1),
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x14, 0, HDA_OUTPUT),
         { } /* end */
 };
 
 static struct snd_kcontrol_new stac9205_mixer[] = {
-        STAC_INPUT_SOURCE(2),
-        STAC_ANALOG_LOOPBACK(0xFE0, 0x7E0, 1),
-
         HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1d, 0x0, HDA_OUTPUT),
 
@@ -1155,9 +1176,13 @@ static struct snd_kcontrol_new stac9205_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new stac9205_loopback[] = {
+        STAC_ANALOG_LOOPBACK(0xFE0, 0x7E0, 1),
+        {}
+};
+
 /* This needs to be generated dynamically based on sequence */
 static struct snd_kcontrol_new stac922x_mixer[] = {
-        STAC_INPUT_SOURCE(2),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x17, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x17, 0x0, HDA_INPUT),
 
@@ -1168,9 +1193,6 @@ static struct snd_kcontrol_new stac922x_mixer[] = {
 
 
 static struct snd_kcontrol_new stac927x_mixer[] = {
-        STAC_INPUT_SOURCE(3),
-        STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB, 1),
-
         HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x18, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1b, 0x0, HDA_OUTPUT),
 
@@ -1182,6 +1204,11 @@ static struct snd_kcontrol_new stac927x_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new stac927x_loopback[] = {
+        STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB, 1),
+        {}
+};
+
 static struct snd_kcontrol_new stac_dmux_mixer = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "Digital Input Source",
@@ -1207,10 +1234,7 @@ static const char *slave_vols[] = {
         "LFE Playback Volume",
         "Side Playback Volume",
         "Headphone Playback Volume",
-        "Headphone2 Playback Volume",
         "Speaker Playback Volume",
-        "External Speaker Playback Volume",
-        "Speaker2 Playback Volume",
         NULL
 };
 
@@ -1221,10 +1245,7 @@ static const char *slave_sws[] = {
         "LFE Playback Switch",
         "Side Playback Switch",
         "Headphone Playback Switch",
-        "Headphone2 Playback Switch",
         "Speaker Playback Switch",
-        "External Speaker Playback Switch",
-        "Speaker2 Playback Switch",
         "IEC958 Playback Switch",
         NULL
 };
@@ -1294,6 +1315,8 @@ static int stac92xx_build_controls(struct hda_codec *codec)
                 unsigned int vmaster_tlv[4];
                 snd_hda_set_vmaster_tlv(codec, spec->multiout.dac_nids[0],
                                         HDA_OUTPUT, vmaster_tlv);
+                /* correct volume offset */
+                vmaster_tlv[2] += vmaster_tlv[3] * spec->volume_offset;
                 err = snd_hda_add_vmaster(codec, "Master Playback Volume",
                                           vmaster_tlv, slave_vols);
                 if (err < 0)
@@ -1306,6 +1329,13 @@ static int stac92xx_build_controls(struct hda_codec *codec)
                         return err;
         }
 
+        if (spec->aloopback_ctl &&
+            snd_hda_get_bool_hint(codec, "loopback") == 1) {
+                err = snd_hda_add_new_ctls(codec, spec->aloopback_ctl);
+                if (err < 0)
+                        return err;
+        }
+
         stac92xx_free_kctls(codec); /* no longer needed */
 
         /* create jack input elements */
@@ -1490,6 +1520,7 @@ static unsigned int *stac9200_brd_tbl[STAC_9200_MODELS] = {
 };
 
 static const char *stac9200_models[STAC_9200_MODELS] = {
+        [STAC_AUTO] = "auto",
         [STAC_REF] = "ref",
         [STAC_9200_OQO] = "oqo",
         [STAC_9200_DELL_D21] = "dell-d21",
@@ -1511,6 +1542,8 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_REF),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
+                      "DFI LanParty", STAC_REF),
         /* Dell laptops have BIOS problem */
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a8,
                       "unknown Dell", STAC_9200_DELL_D21),
@@ -1633,6 +1666,7 @@ static unsigned int *stac925x_brd_tbl[STAC_925x_MODELS] = {
 };
 
 static const char *stac925x_models[STAC_925x_MODELS] = {
+        [STAC_925x_AUTO] = "auto",
         [STAC_REF] = "ref",
         [STAC_M1] = "m1",
         [STAC_M1_2] = "m1-2",
@@ -1660,6 +1694,7 @@ static struct snd_pci_quirk stac925x_codec_id_cfg_tbl[] = {
 static struct snd_pci_quirk stac925x_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, "DFI LanParty", STAC_REF),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101, "DFI LanParty", STAC_REF),
         SND_PCI_QUIRK(0x8384, 0x7632, "Stac9202 Reference Board", STAC_REF),
 
         /* Default table for unknown ID */
@@ -1691,6 +1726,7 @@ static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
 };
 
 static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
+        [STAC_92HD73XX_AUTO] = "auto",
         [STAC_92HD73XX_NO_JD] = "no-jd",
         [STAC_92HD73XX_REF] = "ref",
         [STAC_DELL_M6_AMIC] = "dell-m6-amic",
@@ -1703,6 +1739,8 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                                 "DFI LanParty", STAC_92HD73XX_REF),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
+                                "DFI LanParty", STAC_92HD73XX_REF),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254,
                                 "Dell Studio 1535", STAC_DELL_M6_DMIC),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255,
@@ -1726,52 +1764,68 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
         {} /* terminator */
 };
 
-static unsigned int ref92hd83xxx_pin_configs[14] = {
+static unsigned int ref92hd83xxx_pin_configs[10] = {
         0x02214030, 0x02211010, 0x02a19020, 0x02170130,
         0x01014050, 0x01819040, 0x01014020, 0x90a3014e,
-        0x40f000f0, 0x40f000f0, 0x40f000f0, 0x40f000f0,
         0x01451160, 0x98560170,
 };
 
+static unsigned int dell_s14_pin_configs[10] = {
+        0x02214030, 0x02211010, 0x02a19020, 0x01014050,
+        0x40f000f0, 0x01819040, 0x40f000f0, 0x90a60160,
+        0x40f000f0, 0x40f000f0,
+};
+
 static unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = {
         [STAC_92HD83XXX_REF] = ref92hd83xxx_pin_configs,
         [STAC_92HD83XXX_PWR_REF] = ref92hd83xxx_pin_configs,
+        [STAC_DELL_S14] = dell_s14_pin_configs,
 };
 
 static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
+        [STAC_92HD83XXX_AUTO] = "auto",
         [STAC_92HD83XXX_REF] = "ref",
         [STAC_92HD83XXX_PWR_REF] = "mic-ref",
+        [STAC_DELL_S14] = "dell-s14",
 };
 
 static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_92HD83XXX_REF),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
+                      "DFI LanParty", STAC_92HD83XXX_REF),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ba,
+                      "unknown Dell", STAC_DELL_S14),
         {} /* terminator */
 };
 
-static unsigned int ref92hd71bxx_pin_configs[11] = {
+static unsigned int ref92hd71bxx_pin_configs[STAC92HD71BXX_NUM_PINS] = {
         0x02214030, 0x02a19040, 0x01a19020, 0x01014010,
         0x0181302e, 0x01014010, 0x01019020, 0x90a000f0,
-        0x90a000f0, 0x01452050, 0x01452050,
+        0x90a000f0, 0x01452050, 0x01452050, 0x00000000,
+        0x00000000
 };
 
-static unsigned int dell_m4_1_pin_configs[11] = {
+static unsigned int dell_m4_1_pin_configs[STAC92HD71BXX_NUM_PINS] = {
         0x0421101f, 0x04a11221, 0x40f000f0, 0x90170110,
         0x23a1902e, 0x23014250, 0x40f000f0, 0x90a000f0,
-        0x40f000f0, 0x4f0000f0, 0x4f0000f0,
+        0x40f000f0, 0x4f0000f0, 0x4f0000f0, 0x00000000,
+        0x00000000
 };
 
-static unsigned int dell_m4_2_pin_configs[11] = {
+static unsigned int dell_m4_2_pin_configs[STAC92HD71BXX_NUM_PINS] = {
         0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,
         0x23a1902e, 0x23014250, 0x40f000f0, 0x40f000f0,
-        0x40f000f0, 0x044413b0, 0x044413b0,
+        0x40f000f0, 0x044413b0, 0x044413b0, 0x00000000,
+        0x00000000
 };
 
-static unsigned int dell_m4_3_pin_configs[11] = {
+static unsigned int dell_m4_3_pin_configs[STAC92HD71BXX_NUM_PINS] = {
         0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,
         0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a000f0,
-        0x40f000f0, 0x044413b0, 0x044413b0,
+        0x40f000f0, 0x044413b0, 0x044413b0, 0x00000000,
+        0x00000000
 };
 
 static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
@@ -1781,35 +1835,38 @@ static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
         [STAC_DELL_M4_3]        = dell_m4_3_pin_configs,
         [STAC_HP_M4]            = NULL,
         [STAC_HP_DV5]           = NULL,
+        [STAC_HP_HDX]           = NULL,
 };
 
 static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {
+        [STAC_92HD71BXX_AUTO] = "auto",
         [STAC_92HD71BXX_REF] = "ref",
         [STAC_DELL_M4_1] = "dell-m4-1",
         [STAC_DELL_M4_2] = "dell-m4-2",
         [STAC_DELL_M4_3] = "dell-m4-3",
         [STAC_HP_M4] = "hp-m4",
         [STAC_HP_DV5] = "hp-dv5",
+        [STAC_HP_HDX] = "hp-hdx",
 };
 
 static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_92HD71BXX_REF),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f2,
-                      "HP dv5", STAC_HP_M4),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f4,
-                      "HP dv7", STAC_HP_DV5),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f7,
-                      "HP dv4", STAC_HP_DV5),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,
-                      "HP dv7", STAC_HP_M4),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3600,
-                      "HP dv5", STAC_HP_DV5),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603,
-                      "HP dv5", STAC_HP_DV5),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
+                      "DFI LanParty", STAC_92HD71BXX_REF),
+        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),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600,
+                      "HP dv4-7", STAC_HP_DV5),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3610,
+                      "HP HDX", STAC_HP_HDX),  /* HDX18 */
         SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a,
-                                "unknown HP", STAC_HP_M4),
+                      "HP mini 1000", STAC_HP_M4),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361b,
+                      "HP HDX", STAC_HP_HDX),  /* HDX16 */
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
                                 "unknown Dell", STAC_DELL_M4_1),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0234,
@@ -1961,6 +2018,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
 };
 
 static const char *stac922x_models[STAC_922X_MODELS] = {
+        [STAC_922X_AUTO] = "auto",
         [STAC_D945_REF] = "ref",
         [STAC_D945GTP5] = "5stack",
         [STAC_D945GTP3] = "3stack",
@@ -1988,6 +2046,8 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_D945_REF),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
+                      "DFI LanParty", STAC_D945_REF),
         /* Intel 945G based systems */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0101,
                       "Intel D945G", STAC_D945GTP3),
@@ -2041,6 +2101,9 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = {
                       "Intel D945P", STAC_D945GTP3),
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0707,
                       "Intel D945P", STAC_D945GTP5),
+        /* other intel */
+        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0204,
+                      "Intel D945", STAC_D945_REF),
         /* other systems  */
         /* Apple Intel Mac (Mac Mini, MacBook, MacBook Pro...) */
         SND_PCI_QUIRK(0x8384, 0x7680,
@@ -2065,31 +2128,7 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d7,
                       "Dell XPS M1210", STAC_922X_DELL_M82),
         /* ECS/PC Chips boards */
-        SND_PCI_QUIRK(0x1019, 0x2144,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2608,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2633,
-                      "ECS/PC chips P17G/1333", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2811,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2812,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2813,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2814,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2815,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2816,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2817,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2818,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2819,
-                      "ECS/PC chips", STAC_ECS_202),
-        SND_PCI_QUIRK(0x1019, 0x2820,
+        SND_PCI_QUIRK_MASK(0x1019, 0xf000, 0x2000,
                       "ECS/PC chips", STAC_ECS_202),
         {} /* terminator */
 };
@@ -2132,6 +2171,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
 };
 
 static const char *stac927x_models[STAC_927X_MODELS] = {
+        [STAC_927X_AUTO]        = "auto",
         [STAC_D965_REF_NO_JD]   = "ref-no-jd",
         [STAC_D965_REF]         = "ref",
         [STAC_D965_3ST]         = "3stack",
@@ -2144,26 +2184,16 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_D965_REF),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
+                      "DFI LanParty", STAC_D965_REF),
          /* Intel 946 based systems */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x3d01, "Intel D946", STAC_D965_3ST),
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xa301, "Intel D946", STAC_D965_3ST),
         /* 965 based 3 stack systems */
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2116, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2115, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2114, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2113, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2112, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2111, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2110, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2009, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2008, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2007, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2006, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2005, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2004, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2003, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2002, "Intel D965", STAC_D965_3ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2001, "Intel D965", STAC_D965_3ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2100,
+                           "Intel D965", STAC_D965_3ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2000,
+                           "Intel D965", STAC_D965_3ST),
         /* Dell 3 stack systems */
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f7, "Dell XPS M1730", STAC_DELL_3ST),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01dd, "Dell Dimension E520", STAC_DELL_3ST),
@@ -2179,15 +2209,10 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x02ff, "Dell     ", STAC_DELL_BIOS),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0209, "Dell XPS 1330", STAC_DELL_BIOS),
         /* 965 based 5 stack systems */
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2301, "Intel D965", STAC_D965_5ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2302, "Intel D965", STAC_D965_5ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2303, "Intel D965", STAC_D965_5ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2304, "Intel D965", STAC_D965_5ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2305, "Intel D965", STAC_D965_5ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2501, "Intel D965", STAC_D965_5ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2502, "Intel D965", STAC_D965_5ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2503, "Intel D965", STAC_D965_5ST),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2504, "Intel D965", STAC_D965_5ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2300,
+                           "Intel D965", STAC_D965_5ST),
+        SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2500,
+                           "Intel D965", STAC_D965_5ST),
         {} /* terminator */
 };
 
@@ -2240,19 +2265,25 @@ static unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = {
         [STAC_9205_DELL_M42] = dell_9205_m42_pin_configs,
         [STAC_9205_DELL_M43] = dell_9205_m43_pin_configs,
         [STAC_9205_DELL_M44] = dell_9205_m44_pin_configs,
+        [STAC_9205_EAPD] = NULL,
 };
 
 static const char *stac9205_models[STAC_9205_MODELS] = {
+        [STAC_9205_AUTO] = "auto",
         [STAC_9205_REF] = "ref",
         [STAC_9205_DELL_M42] = "dell-m42",
         [STAC_9205_DELL_M43] = "dell-m43",
         [STAC_9205_DELL_M44] = "dell-m44",
+        [STAC_9205_EAPD] = "eapd",
 };
 
 static struct snd_pci_quirk stac9205_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_9205_REF),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
+                      "DFI LanParty", STAC_9205_REF),
+        /* Dell */
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f1,
                       "unknown Dell", STAC_9205_DELL_M42),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f2,
@@ -2283,101 +2314,24 @@ 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),
+        /* Gateway */
+        SND_PCI_QUIRK(0x107b, 0x0565, "Gateway T1616", STAC_9205_EAPD),
         {} /* terminator */
 };
 
-static int stac92xx_save_bios_config_regs(struct hda_codec *codec)
+static void stac92xx_set_config_regs(struct hda_codec *codec,
+                                     unsigned int *pincfgs)
 {
         int i;
         struct sigmatel_spec *spec = codec->spec;
-        
-        kfree(spec->pin_configs);
-        spec->pin_configs = kcalloc(spec->num_pins, sizeof(*spec->pin_configs),
-                                    GFP_KERNEL);
-        if (!spec->pin_configs)
-                return -ENOMEM;
-        
-        for (i = 0; i < spec->num_pins; i++) {
-                hda_nid_t nid = spec->pin_nids[i];
-                unsigned int pin_cfg;
-                
-                pin_cfg = snd_hda_codec_read(codec, nid, 0, 
-                        AC_VERB_GET_CONFIG_DEFAULT, 0x00);      
-                snd_printdd(KERN_INFO "hda_codec: pin nid %2.2x bios pin config %8.8x\n",
-                                        nid, pin_cfg);
-                spec->pin_configs[i] = pin_cfg;
-        }
-        
-        return 0;
-}
 
-static void stac92xx_set_config_reg(struct hda_codec *codec,
-                                    hda_nid_t pin_nid, unsigned int pin_config)
-{
-        int i;
-        snd_hda_codec_write(codec, pin_nid, 0,
-                            AC_VERB_SET_CONFIG_DEFAULT_BYTES_0,
-                            pin_config & 0x000000ff);
-        snd_hda_codec_write(codec, pin_nid, 0,
-                            AC_VERB_SET_CONFIG_DEFAULT_BYTES_1,
-                            (pin_config & 0x0000ff00) >> 8);
-        snd_hda_codec_write(codec, pin_nid, 0,
-                            AC_VERB_SET_CONFIG_DEFAULT_BYTES_2,
-                            (pin_config & 0x00ff0000) >> 16);
-        snd_hda_codec_write(codec, pin_nid, 0,
-                            AC_VERB_SET_CONFIG_DEFAULT_BYTES_3,
-                            pin_config >> 24);
-        i = snd_hda_codec_read(codec, pin_nid, 0,
-                               AC_VERB_GET_CONFIG_DEFAULT,
-                               0x00);   
-        snd_printdd(KERN_INFO "hda_codec: pin nid %2.2x pin config %8.8x\n",
-                    pin_nid, i);
-}
-
-static void stac92xx_set_config_regs(struct hda_codec *codec)
-{
-        int i;
-        struct sigmatel_spec *spec = codec->spec;
-
-        if (!spec->pin_configs)
-                return;
+        if (!pincfgs)
+                return;
 
         for (i = 0; i < spec->num_pins; i++)
-                stac92xx_set_config_reg(codec, spec->pin_nids[i],
-                                        spec->pin_configs[i]);
-}
-
-static int stac_save_pin_cfgs(struct hda_codec *codec, unsigned int *pins)
-{
-        struct sigmatel_spec *spec = codec->spec;
-
-        if (!pins)
-                return stac92xx_save_bios_config_regs(codec);
-
-        kfree(spec->pin_configs);
-        spec->pin_configs = kmemdup(pins,
-                                    spec->num_pins * sizeof(*pins),
-                                    GFP_KERNEL);
-        if (!spec->pin_configs)
-                return -ENOMEM;
-
-        stac92xx_set_config_regs(codec);
-        return 0;
-}
-
-static void stac_change_pin_config(struct hda_codec *codec, hda_nid_t nid,
-                                   unsigned int cfg)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < spec->num_pins; i++) {
-                if (spec->pin_nids[i] == nid) {
-                        spec->pin_configs[i] = cfg;
-                        stac92xx_set_config_reg(codec, nid, cfg);
-                        break;
-                }
-        }
+                if (spec->pin_nids[i] && pincfgs[i])
+                        snd_hda_codec_set_pincfg(codec, spec->pin_nids[i],
+                                                 pincfgs[i]);
 }
 
 /*
@@ -2567,7 +2521,7 @@ static int stac92xx_build_pcms(struct hda_codec *codec)
                 codec->num_pcms++;
                 info++;
                 info->name = "STAC92xx Digital";
-                info->pcm_type = HDA_PCM_TYPE_SPDIF;
+                info->pcm_type = spec->autocfg.dig_out_type[0];
                 if (spec->multiout.dig_out_nid) {
                         info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_digital_playback;
                         info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
@@ -2583,8 +2537,7 @@ static int stac92xx_build_pcms(struct hda_codec *codec)
 
 static unsigned int stac92xx_get_vref(struct hda_codec *codec, hda_nid_t nid)
 {
-        unsigned int pincap = snd_hda_param_read(codec, nid,
-                                                 AC_PAR_PIN_CAP);
+        unsigned int pincap = snd_hda_query_pin_caps(codec, nid);
         pincap = (pincap & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT;
         if (pincap & AC_PINCAP_VREF_100)
                 return AC_PINCTL_VREF_100;
@@ -2759,22 +2712,37 @@ static struct snd_kcontrol_new stac92xx_control_templates[] = {
 };
 
 /* add dynamic controls */
-static int stac92xx_add_control_temp(struct sigmatel_spec *spec,
-                                     struct snd_kcontrol_new *ktemp,
-                                     int idx, const char *name,
-                                     unsigned long val)
+static struct snd_kcontrol_new *
+stac_control_new(struct sigmatel_spec *spec,
+                 struct snd_kcontrol_new *ktemp,
+                 const char *name)
 {
         struct snd_kcontrol_new *knew;
 
         snd_array_init(&spec->kctls, sizeof(*knew), 32);
         knew = snd_array_new(&spec->kctls);
         if (!knew)
-                return -ENOMEM;
+                return NULL;
         *knew = *ktemp;
-        knew->index = idx;
         knew->name = kstrdup(name, GFP_KERNEL);
-        if (!knew->name)
+        if (!knew->name) {
+                /* roolback */
+                memset(knew, 0, sizeof(*knew));
+                spec->kctls.alloced--;
+                return NULL;
+        }
+        return knew;
+}
+
+static int stac92xx_add_control_temp(struct sigmatel_spec *spec,
+                                     struct snd_kcontrol_new *ktemp,
+                                     int idx, const char *name,
+                                     unsigned long val)
+{
+        struct snd_kcontrol_new *knew = stac_control_new(spec, ktemp, name);
+        if (!knew)
                 return -ENOMEM;
+        knew->index = idx;
         knew->private_value = val;
         return 0;
 }
@@ -2796,6 +2764,29 @@ static inline int stac92xx_add_control(struct sigmatel_spec *spec, int type,
         return stac92xx_add_control_idx(spec, type, 0, name, val);
 }
 
+static struct snd_kcontrol_new stac_input_src_temp = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Input Source",
+        .info = stac92xx_mux_enum_info,
+        .get = stac92xx_mux_enum_get,
+        .put = stac92xx_mux_enum_put,
+};
+
+static int stac92xx_add_input_source(struct sigmatel_spec *spec)
+{
+        struct snd_kcontrol_new *knew;
+        struct hda_input_mux *imux = &spec->private_imux;
+
+        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);
+        if (!knew)
+                return -ENOMEM;
+        knew->count = spec->num_adcs;
+        return 0;
+}
+
 /* check whether the line-input can be used as line-out */
 static hda_nid_t check_line_out_switch(struct hda_codec *codec)
 {
@@ -2807,7 +2798,7 @@ static hda_nid_t check_line_out_switch(struct hda_codec *codec)
         if (cfg->line_out_type != AUTO_PIN_LINE_OUT)
                 return 0;
         nid = cfg->input_pins[AUTO_PIN_LINE];
-        pincap = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
+        pincap = snd_hda_query_pin_caps(codec, nid);
         if (pincap & AC_PINCAP_OUT)
                 return nid;
         return 0;
@@ -2826,12 +2817,11 @@ static hda_nid_t check_mic_out_switch(struct hda_codec *codec)
         mic_pin = AUTO_PIN_MIC;
         for (;;) {
                 hda_nid_t nid = cfg->input_pins[mic_pin];
-                def_conf = snd_hda_codec_read(codec, nid, 0,
-                                              AC_VERB_GET_CONFIG_DEFAULT, 0);
+                def_conf = snd_hda_codec_get_pincfg(codec, nid);
                 /* some laptops have an internal analog microphone
                  * which can't be used as a output */
                 if (get_defcfg_connect(def_conf) != AC_JACK_PORT_FIXED) {
-                        pincap = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
+                        pincap = snd_hda_query_pin_caps(codec, nid);
                         if (pincap & AC_PINCAP_OUT)
                                 return nid;
                 }
@@ -2879,8 +2869,7 @@ 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);
         for (j = 0; j < conn_len; j++) {
-                wcaps = snd_hda_param_read(codec, conn[j],
-                                           AC_PAR_AUDIO_WIDGET_CAP);
+                wcaps = get_wcaps(codec, conn[j]);
                 wtype = (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
                 /* we check only analog outputs */
                 if (wtype != AC_WID_AUD_OUT || (wcaps & AC_WCAP_DIGITAL))
@@ -2895,6 +2884,16 @@ static hda_nid_t get_unassigned_dac(struct hda_codec *codec, hda_nid_t nid)
                         return conn[j];
                 }
         }
+        /* if all DACs are already assigned, connect to the primary DAC */
+        if (conn_len > 1) {
+                for (j = 0; j < conn_len; j++) {
+                        if (conn[j] == spec->multiout.dac_nids[0]) {
+                                snd_hda_codec_write_cache(codec, nid, 0,
+                                                  AC_VERB_SET_CONNECT_SEL, j);
+                                break;
+                        }
+                }
+        }
         return 0;
 }
 
@@ -2935,6 +2934,26 @@ static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec)
                 add_spec_dacs(spec, dac);
         }
 
+        for (i = 0; i < cfg->hp_outs; i++) {
+                nid = cfg->hp_pins[i];
+                dac = get_unassigned_dac(codec, nid);
+                if (dac) {
+                        if (!spec->multiout.hp_nid)
+                                spec->multiout.hp_nid = dac;
+                        else
+                                add_spec_extra_dacs(spec, dac);
+                }
+                spec->hp_dacs[i] = dac;
+        }
+
+        for (i = 0; i < cfg->speaker_outs; i++) {
+                nid = cfg->speaker_pins[i];
+                dac = get_unassigned_dac(codec, nid);
+                if (dac)
+                        add_spec_extra_dacs(spec, dac);
+                spec->speaker_dacs[i] = dac;
+        }
+
         /* add line-in as output */
         nid = check_line_out_switch(codec);
         if (nid) {
@@ -2962,26 +2981,6 @@ static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec)
                 }
         }
 
-        for (i = 0; i < cfg->hp_outs; i++) {
-                nid = cfg->hp_pins[i];
-                dac = get_unassigned_dac(codec, nid);
-                if (dac) {
-                        if (!spec->multiout.hp_nid)
-                                spec->multiout.hp_nid = dac;
-                        else
-                                add_spec_extra_dacs(spec, dac);
-                }
-                spec->hp_dacs[i] = dac;
-        }
-
-        for (i = 0; i < cfg->speaker_outs; i++) {
-                nid = cfg->speaker_pins[i];
-                dac = get_unassigned_dac(codec, nid);
-                if (dac)
-                        add_spec_extra_dacs(spec, dac);
-                spec->speaker_dacs[i] = dac;
-        }
-
         snd_printd("stac92xx: dac_nids=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
                    spec->multiout.num_dacs,
                    spec->multiout.dac_nids[0],
@@ -2994,24 +2993,47 @@ static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec)
 }
 
 /* create volume control/switch for the given prefx type */
-static int create_controls(struct sigmatel_spec *spec, const char *pfx, hda_nid_t nid, int chs)
+static int create_controls_idx(struct hda_codec *codec, const char *pfx,
+                               int idx, hda_nid_t nid, int chs)
 {
+        struct sigmatel_spec *spec = codec->spec;
         char name[32];
         int err;
 
+        if (!spec->check_volume_offset) {
+                unsigned int caps, step, nums, db_scale;
+                caps = query_amp_caps(codec, nid, HDA_OUTPUT);
+                step = (caps & AC_AMPCAP_STEP_SIZE) >>
+                        AC_AMPCAP_STEP_SIZE_SHIFT;
+                step = (step + 1) * 25; /* in .01dB unit */
+                nums = (caps & AC_AMPCAP_NUM_STEPS) >>
+                        AC_AMPCAP_NUM_STEPS_SHIFT;
+                db_scale = nums * step;
+                /* if dB scale is over -64dB, and finer enough,
+                 * let's reduce it to half
+                 */
+                if (db_scale > 6400 && nums >= 0x1f)
+                        spec->volume_offset = nums / 2;
+                spec->check_volume_offset = 1;
+        }
+
         sprintf(name, "%s Playback Volume", pfx);
-        err = stac92xx_add_control(spec, STAC_CTL_WIDGET_VOL, name,
-                                   HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT));
+        err = stac92xx_add_control_idx(spec, STAC_CTL_WIDGET_VOL, idx, name,
+                HDA_COMPOSE_AMP_VAL_OFS(nid, chs, 0, HDA_OUTPUT,
+                                        spec->volume_offset));
         if (err < 0)
                 return err;
         sprintf(name, "%s Playback Switch", pfx);
-        err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE, name,
+        err = stac92xx_add_control_idx(spec, STAC_CTL_WIDGET_MUTE, idx, name,
                                    HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT));
         if (err < 0)
                 return err;
         return 0;
 }
 
+#define create_controls(codec, pfx, nid, chs) \
+        create_controls_idx(codec, pfx, 0, nid, chs)
+
 static int add_spec_dacs(struct sigmatel_spec *spec, hda_nid_t nid)
 {
         if (spec->multiout.num_dacs > 4) {
@@ -3037,40 +3059,32 @@ static int add_spec_extra_dacs(struct sigmatel_spec *spec, hda_nid_t nid)
         return 1;
 }
 
-static int is_unique_dac(struct sigmatel_spec *spec, hda_nid_t nid)
-{
-        int i;
-
-        if (spec->autocfg.line_outs != 1)
-                return 0;
-        if (spec->multiout.hp_nid == nid)
-                return 0;
-        for (i = 0; i < ARRAY_SIZE(spec->multiout.extra_out_nid); i++)
-                if (spec->multiout.extra_out_nid[i] == nid)
-                        return 0;
-        return 1;
-}
-
-/* add playback controls from the parsed DAC table */
-static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
-                                               const struct auto_pin_cfg *cfg)
+/* Create output controls
+ * The mixer elements are named depending on the given type (AUTO_PIN_XXX_OUT)
+ */
+static int create_multi_out_ctls(struct hda_codec *codec, int num_outs,
+                                 const hda_nid_t *pins,
+                                 const hda_nid_t *dac_nids,
+                                 int type)
 {
         struct sigmatel_spec *spec = codec->spec;
         static const char *chname[4] = {
                 "Front", "Surround", NULL /*CLFE*/, "Side"
         };
-        hda_nid_t nid = 0;
+        hda_nid_t nid;
         int i, err;
         unsigned int wid_caps;
 
-        for (i = 0; i < cfg->line_outs && spec->multiout.dac_nids[i]; i++) {
-                nid = spec->multiout.dac_nids[i];
-                if (i == 2) {
+        for (i = 0; i < num_outs && i < ARRAY_SIZE(chname); i++) {
+                nid = dac_nids[i];
+                if (!nid)
+                        continue;
+                if (type != AUTO_PIN_HP_OUT && i == 2) {
                         /* Center/LFE */
-                        err = create_controls(spec, "Center", nid, 1);
+                        err = create_controls(codec, "Center", nid, 1);
                         if (err < 0)
                                 return err;
-                        err = create_controls(spec, "LFE", nid, 2);
+                        err = create_controls(codec, "LFE", nid, 2);
                         if (err < 0)
                                 return err;
 
@@ -3086,23 +3100,47 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
                         }
 
                 } else {
-                        const char *name = chname[i];
-                        /* if it's a single DAC, assign a better name */
-                        if (!i && is_unique_dac(spec, nid)) {
-                                switch (cfg->line_out_type) {
-                                case AUTO_PIN_HP_OUT:
-                                        name = "Headphone";
-                                        break;
-                                case AUTO_PIN_SPEAKER_OUT:
-                                        name = "Speaker";
-                                        break;
-                                }
+                        const char *name;
+                        int idx;
+                        switch (type) {
+                        case AUTO_PIN_HP_OUT:
+                                name = "Headphone";
+                                idx = i;
+                                break;
+                        case AUTO_PIN_SPEAKER_OUT:
+                                name = "Speaker";
+                                idx = i;
+                                break;
+                        default:
+                                name = chname[i];
+                                idx = 0;
+                                break;
                         }
-                        err = create_controls(spec, name, nid, 3);
+                        err = create_controls_idx(codec, name, idx, nid, 3);
                         if (err < 0)
                                 return err;
+                        if (type == AUTO_PIN_HP_OUT && !spec->hp_detect) {
+                                wid_caps = get_wcaps(codec, pins[i]);
+                                if (wid_caps & AC_WCAP_UNSOL_CAP)
+                                        spec->hp_detect = 1;
+                        }
                 }
         }
+        return 0;
+}
+
+/* add playback controls from the parsed DAC table */
+static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
+                                               const struct auto_pin_cfg *cfg)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int err;
+
+        err = create_multi_out_ctls(codec, cfg->line_outs, cfg->line_out_pins,
+                                    spec->multiout.dac_nids,
+                                    cfg->line_out_type);
+        if (err < 0)
+                return err;
 
         if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) {
                 err = stac92xx_add_control(spec,
@@ -3137,40 +3175,18 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec,
                                         struct auto_pin_cfg *cfg)
 {
         struct sigmatel_spec *spec = codec->spec;
-        hda_nid_t nid;
-        int i, err, nums;
+        int err;
+
+        err = create_multi_out_ctls(codec, cfg->hp_outs, cfg->hp_pins,
+                                    spec->hp_dacs, AUTO_PIN_HP_OUT);
+        if (err < 0)
+                return err;
+
+        err = create_multi_out_ctls(codec, cfg->speaker_outs, cfg->speaker_pins,
+                                    spec->speaker_dacs, AUTO_PIN_SPEAKER_OUT);
+        if (err < 0)
+                return err;
 
-        nums = 0;
-        for (i = 0; i < cfg->hp_outs; i++) {
-                static const char *pfxs[] = {
-                        "Headphone", "Headphone2", "Headphone3",
-                };
-                unsigned int wid_caps = get_wcaps(codec, cfg->hp_pins[i]);
-                if (wid_caps & AC_WCAP_UNSOL_CAP)
-                        spec->hp_detect = 1;
-                if (nums >= ARRAY_SIZE(pfxs))
-                        continue;
-                nid = spec->hp_dacs[i];
-                if (!nid)
-                        continue;
-                err = create_controls(spec, pfxs[nums++], nid, 3);
-                if (err < 0)
-                        return err;
-        }
-        nums = 0;
-        for (i = 0; i < cfg->speaker_outs; i++) {
-                static const char *pfxs[] = {
-                        "Speaker", "External Speaker", "Speaker2",
-                };
-                if (nums >= ARRAY_SIZE(pfxs))
-                        continue;
-                nid = spec->speaker_dacs[i];
-                if (!nid)
-                        continue;
-                err = create_controls(spec, pfxs[nums++], nid, 3);
-                if (err < 0)
-                        return err;
-        }
         return 0;
 }
 
@@ -3379,11 +3395,7 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec,
                 unsigned int wcaps;
                 unsigned int def_conf;
 
-                def_conf = snd_hda_codec_read(codec,
-                                              spec->dmic_nids[i],
-                                              0,
-                                              AC_VERB_GET_CONFIG_DEFAULT,
-                                              0);
+                def_conf = snd_hda_codec_get_pincfg(codec, spec->dmic_nids[i]);
                 if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)
                         continue;
 
@@ -3507,6 +3519,7 @@ static void stac92xx_auto_init_hp_out(struct hda_codec *codec)
 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;
+        int hp_swap = 0;
         int err;
 
         if ((err = snd_hda_parse_pin_def_config(codec,
@@ -3516,7 +3529,6 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
         if (! spec->autocfg.line_outs)
                 return 0; /* can't find valid pin config */
 
-#if 0 /* FIXME: temporarily disabled */
         /* If we have no real line-out pin and multiple hp-outs, HPs should
          * be set up as multi-channel outputs.
          */
@@ -3535,8 +3547,8 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
                 spec->autocfg.line_outs = spec->autocfg.hp_outs;
                 spec->autocfg.line_out_type = AUTO_PIN_HP_OUT;
                 spec->autocfg.hp_outs = 0;
+                hp_swap = 1;
         }
-#endif /* FIXME: temporarily disabled */
         if (spec->autocfg.mono_out_pin) {
                 int dir = get_wcaps(codec, spec->autocfg.mono_out_pin) &
                         (AC_WCAP_OUT_AMP | AC_WCAP_IN_AMP);
@@ -3629,12 +3641,19 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
 #endif
 
         err = stac92xx_auto_create_hp_ctls(codec, &spec->autocfg);
-
         if (err < 0)
                 return err;
 
-        err = stac92xx_auto_create_analog_input_ctls(codec, &spec->autocfg);
+        /* All output parsing done, now restore the swapped hp pins */
+        if (hp_swap) {
+                memcpy(spec->autocfg.hp_pins, spec->autocfg.line_out_pins,
+                       sizeof(spec->autocfg.hp_pins));
+                spec->autocfg.hp_outs = spec->autocfg.line_outs;
+                spec->autocfg.line_out_type = AUTO_PIN_HP_OUT;
+                spec->autocfg.line_outs = 0;
+        }
 
+        err = stac92xx_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
 
@@ -3663,11 +3682,15 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
                         return err;
         }
 
+        err = stac92xx_add_input_source(spec);
+        if (err < 0)
+                return err;
+
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
         if (spec->multiout.max_channels > 2)
                 spec->surr_switch = 1;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = dig_out;
         if (dig_in && spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = dig_in;
@@ -3730,9 +3753,7 @@ static int stac9200_auto_create_lfe_ctls(struct hda_codec *codec,
                 for (i = 0; i < spec->autocfg.line_outs && lfe_pin == 0x0; i++) {
                         hda_nid_t pin = spec->autocfg.line_out_pins[i];
                         unsigned int defcfg;
-                        defcfg = snd_hda_codec_read(codec, pin, 0,
-                                                 AC_VERB_GET_CONFIG_DEFAULT,
-                                                 0x00);
+                        defcfg = snd_hda_codec_get_pincfg(codec, pin);
                         if (get_defcfg_device(defcfg) == AC_JACK_SPEAKER) {
                                 unsigned int wcaps = get_wcaps(codec, pin);
                                 wcaps &= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP);
@@ -3745,7 +3766,7 @@ static int stac9200_auto_create_lfe_ctls(struct hda_codec *codec,
         }
 
         if (lfe_pin) {
-                err = create_controls(spec, "LFE", lfe_pin, 1);
+                err = create_controls(codec, "LFE", lfe_pin, 1);
                 if (err < 0)
                         return err;
         }
@@ -3776,7 +3797,11 @@ static int stac9200_parse_auto_config(struct hda_codec *codec)
                         return err;
         }
 
-        if (spec->autocfg.dig_out_pin)
+        err = stac92xx_add_input_source(spec);
+        if (err < 0)
+                return err;
+
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = 0x05;
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = 0x04;
@@ -3832,8 +3857,7 @@ static int stac92xx_add_jack(struct hda_codec *codec,
 #ifdef CONFIG_SND_JACK
         struct sigmatel_spec *spec = codec->spec;
         struct sigmatel_jack *jack;
-        int def_conf = snd_hda_codec_read(codec, nid,
-                        0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+        int def_conf = snd_hda_codec_get_pincfg(codec, nid);
         int connectivity = get_defcfg_connect(def_conf);
         char name[32];
 
@@ -3948,6 +3972,36 @@ 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);
 
+/* 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);
+                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;
+        val = snd_hda_get_bool_hint(codec, "eapd_switch");
+        if (val >= 0)
+                spec->eapd_switch = val;
+}
+
 static int stac92xx_init(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
@@ -3964,6 +4018,9 @@ static int stac92xx_init(struct hda_codec *codec)
                                 spec->adc_nids[i], 0,
                                 AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
 
+        /* override some hints */
+        stac_store_hints(codec);
+
         /* set up GPIO */
         gpio = spec->gpio_data;
         /* turn on EAPD statically when spec->eapd_switch isn't set.
@@ -4013,8 +4070,7 @@ static int stac92xx_init(struct hda_codec *codec)
                                                                  pinctl);
                                 }
                         }
-                        conf = snd_hda_codec_read(codec, nid, 0,
-                                              AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        conf = snd_hda_codec_get_pincfg(codec, nid);
                         if (get_defcfg_connect(conf) != AC_JACK_PORT_FIXED) {
                                 enable_pin_detect(codec, nid,
                                                   STAC_INSERT_EVENT);
@@ -4026,8 +4082,8 @@ static int stac92xx_init(struct hda_codec *codec)
         for (i = 0; i < spec->num_dmics; i++)
                 stac92xx_auto_set_pinctl(codec, spec->dmic_nids[i],
                                         AC_PINCTL_IN_EN);
-        if (cfg->dig_out_pin)
-                stac92xx_auto_set_pinctl(codec, cfg->dig_out_pin,
+        if (cfg->dig_out_pins[0])
+                stac92xx_auto_set_pinctl(codec, cfg->dig_out_pins[0],
                                          AC_PINCTL_OUT_EN);
         if (cfg->dig_in_pin)
                 stac92xx_auto_set_pinctl(codec, cfg->dig_in_pin,
@@ -4055,8 +4111,7 @@ static int stac92xx_init(struct hda_codec *codec)
                         stac_toggle_power_map(codec, nid, 1);
                         continue;
                 }
-                def_conf = snd_hda_codec_read(codec, nid, 0,
-                                              AC_VERB_GET_CONFIG_DEFAULT, 0);
+                def_conf = snd_hda_codec_get_pincfg(codec, nid);
                 def_conf = get_defcfg_connect(def_conf);
                 /* skip any ports that don't have jacks since presence
                  * detection is useless */
@@ -4110,7 +4165,6 @@ static void stac92xx_free(struct hda_codec *codec)
         if (! spec)
                 return;
 
-        kfree(spec->pin_configs);
         stac92xx_free_jacks(codec);
         snd_array_free(&spec->events);
 
@@ -4121,7 +4175,9 @@ static void stac92xx_free(struct hda_codec *codec)
 static void stac92xx_set_pinctl(struct hda_codec *codec, hda_nid_t nid,
                                 unsigned int flag)
 {
-        unsigned int pin_ctl = snd_hda_codec_read(codec, nid,
+        unsigned int old_ctl, pin_ctl;
+
+        pin_ctl = snd_hda_codec_read(codec, nid,
                         0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0x00);
 
         if (pin_ctl & AC_PINCTL_IN_EN) {
@@ -4135,14 +4191,17 @@ static void stac92xx_set_pinctl(struct hda_codec *codec, hda_nid_t nid,
                         return;
         }
 
+        old_ctl = pin_ctl;
         /* if setting pin direction bits, clear the current
            direction bits first */
         if (flag & (AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN))
                 pin_ctl &= ~(AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN);
         
-        snd_hda_codec_write_cache(codec, nid, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL,
-                        pin_ctl | flag);
+        pin_ctl |= flag;
+        if (old_ctl != pin_ctl)
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                          pin_ctl);
 }
 
 static void stac92xx_reset_pinctl(struct hda_codec *codec, hda_nid_t nid,
@@ -4150,9 +4209,10 @@ static void stac92xx_reset_pinctl(struct hda_codec *codec, hda_nid_t nid,
 {
         unsigned int pin_ctl = snd_hda_codec_read(codec, nid,
                         0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0x00);
-        snd_hda_codec_write_cache(codec, nid, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL,
-                        pin_ctl & ~flag);
+        if (pin_ctl & flag)
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                          pin_ctl & ~flag);
 }
 
 static int get_pin_presence(struct hda_codec *codec, hda_nid_t nid)
@@ -4415,7 +4475,6 @@ static int stac92xx_resume(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
 
-        stac92xx_set_config_regs(codec);
         stac92xx_init(codec);
         snd_hda_codec_resume_amp(codec);
         snd_hda_codec_resume_cache(codec);
@@ -4426,6 +4485,37 @@ static int stac92xx_resume(struct hda_codec *codec)
         return 0;
 }
 
+
+/*
+ * using power check for controlling mute led of HP HDX notebooks
+ * check for mute state only on Speakers (nid = 0x10)
+ *
+ * For this feature CONFIG_SND_HDA_POWER_SAVE is needed, otherwise
+ * the LED is NOT working properly !
+ */
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static int stac92xx_hp_hdx_check_power_status(struct hda_codec *codec,
+                                              hda_nid_t nid)
+{
+        struct sigmatel_spec *spec = codec->spec;
+
+        if (nid == 0x10) {
+                if (snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) &
+                    HDA_AMP_MUTE)
+                        spec->gpio_data &= ~0x08;  /* orange */
+                else
+                        spec->gpio_data |= 0x08;   /* white */
+
+                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;
@@ -4464,16 +4554,11 @@ static int patch_stac9200(struct hda_codec *codec)
         spec->board_config = snd_hda_check_board_config(codec, STAC_9200_MODELS,
                                                         stac9200_models,
                                                         stac9200_cfg_tbl);
-        if (spec->board_config < 0) {
+        if (spec->board_config < 0)
                 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9200, using BIOS defaults\n");
-                err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
+        else
+                stac92xx_set_config_regs(codec,
                                          stac9200_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
-        }
 
         spec->multiout.max_channels = 2;
         spec->multiout.num_dacs = 1;
@@ -4541,17 +4626,12 @@ static int patch_stac925x(struct hda_codec *codec)
                                                         stac925x_models,
                                                         stac925x_cfg_tbl);
  again:
-        if (spec->board_config < 0) {
+        if (spec->board_config < 0)
                 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x,"
                                       "using BIOS defaults\n");
-                err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
+        else
+                stac92xx_set_config_regs(codec,
                                          stac925x_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
-        }
 
         spec->multiout.max_channels = 2;
         spec->multiout.num_dacs = 1;
@@ -4629,17 +4709,12 @@ static int patch_stac92hd73xx(struct hda_codec *codec)
                                                         stac92hd73xx_models,
                                                         stac92hd73xx_cfg_tbl);
 again:
-        if (spec->board_config < 0) {
+        if (spec->board_config < 0)
                 snd_printdd(KERN_INFO "hda_codec: Unknown model for"
                         " STAC92HD73XX, using BIOS defaults\n");
-                err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
+        else
+                stac92xx_set_config_regs(codec,
                                 stac92hd73xx_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
-        }
 
         num_dacs = snd_hda_get_connections(codec, 0x0a,
                         conn, STAC92HD73_DAC_COUNT + 2) - 1;
@@ -4653,14 +4728,18 @@ again:
         case 0x3: /* 6 Channel */
                 spec->mixer = stac92hd73xx_6ch_mixer;
                 spec->init = stac92hd73xx_6ch_core_init;
+                spec->aloopback_ctl = stac92hd73xx_6ch_loopback;
                 break;
         case 0x4: /* 8 Channel */
                 spec->mixer = stac92hd73xx_8ch_mixer;
                 spec->init = stac92hd73xx_8ch_core_init;
+                spec->aloopback_ctl = stac92hd73xx_8ch_loopback;
                 break;
         case 0x5: /* 10 Channel */
                 spec->mixer = stac92hd73xx_10ch_mixer;
                 spec->init = stac92hd73xx_10ch_core_init;
+                spec->aloopback_ctl = stac92hd73xx_10ch_loopback;
+                break;
         }
         spec->multiout.dac_nids = spec->dac_nids;
 
@@ -4699,18 +4778,18 @@ again:
                         spec->init = dell_m6_core_init;
                 switch (spec->board_config) {
                 case STAC_DELL_M6_AMIC: /* Analog Mics */
-                        stac92xx_set_config_reg(codec, 0x0b, 0x90A70170);
+                        snd_hda_codec_set_pincfg(codec, 0x0b, 0x90A70170);
                         spec->num_dmics = 0;
                         spec->private_dimux.num_items = 1;
                         break;
                 case STAC_DELL_M6_DMIC: /* Digital Mics */
-                        stac92xx_set_config_reg(codec, 0x13, 0x90A60160);
+                        snd_hda_codec_set_pincfg(codec, 0x13, 0x90A60160);
                         spec->num_dmics = 1;
                         spec->private_dimux.num_items = 2;
                         break;
                 case STAC_DELL_M6_BOTH: /* Both */
-                        stac92xx_set_config_reg(codec, 0x0b, 0x90A70170);
-                        stac92xx_set_config_reg(codec, 0x13, 0x90A60160);
+                        snd_hda_codec_set_pincfg(codec, 0x0b, 0x90A70170);
+                        snd_hda_codec_set_pincfg(codec, 0x13, 0x90A60160);
                         spec->num_dmics = 1;
                         spec->private_dimux.num_items = 2;
                         break;
@@ -4773,6 +4852,7 @@ 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)
@@ -4791,15 +4871,6 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
         spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
         spec->multiout.dac_nids = spec->dac_nids;
 
-
-        /* set port 0xe to select the last DAC
-         */
-        num_dacs = snd_hda_get_connections(codec, 0x0e,
-                conn, STAC92HD83_DAC_COUNT + 1) - 1;
-
-        snd_hda_codec_write_cache(codec, 0xe, 0,
-                AC_VERB_SET_CONNECT_SEL, num_dacs);
-
         spec->init = stac92hd83xxx_core_init;
         spec->mixer = stac92hd83xxx_mixer;
         spec->num_pins = ARRAY_SIZE(stac92hd83xxx_pin_nids);
@@ -4814,17 +4885,12 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
                                                         stac92hd83xxx_models,
                                                         stac92hd83xxx_cfg_tbl);
 again:
-        if (spec->board_config < 0) {
+        if (spec->board_config < 0)
                 snd_printdd(KERN_INFO "hda_codec: Unknown model for"
                         " STAC92HD83XXX, using BIOS defaults\n");
-                err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
+        else
+                stac92xx_set_config_regs(codec,
                                 stac92hd83xxx_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
-        }
 
         switch (codec->vendor_id) {
         case 0x111d7604:
@@ -4851,6 +4917,23 @@ 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,
+                                conn, STAC92HD83_DAC_COUNT + 1) - 1;
+
+        /* set port X to select the last DAC
+         */
+        snd_hda_codec_write_cache(codec, nid, 0,
+                        AC_VERB_SET_CONNECT_SEL, num_dacs);
+
         codec->patch_ops = stac92xx_patch_ops;
 
         codec->proc_widget_hook = stac92hd_proc_hook;
@@ -4858,7 +4941,16 @@ again:
         return 0;
 }
 
-static struct hda_input_mux stac92hd71bxx_dmux = {
+static struct hda_input_mux stac92hd71bxx_dmux_nomixer = {
+        .num_items = 3,
+        .items = {
+                { "Analog Inputs", 0x00 },
+                { "Digital Mic 1", 0x02 },
+                { "Digital Mic 2", 0x03 },
+        }
+};
+
+static struct hda_input_mux stac92hd71bxx_dmux_amixer = {
         .num_items = 4,
         .items = {
                 { "Analog Inputs", 0x00 },
@@ -4868,10 +4960,67 @@ static struct hda_input_mux stac92hd71bxx_dmux = {
         }
 };
 
+/* get the pin connection (fixed, none, etc) */
+static unsigned int stac_get_defcfg_connect(struct hda_codec *codec, int idx)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        unsigned int cfg;
+
+        cfg = snd_hda_codec_get_pincfg(codec, spec->pin_nids[idx]);
+        return get_defcfg_connect(cfg);
+}
+
+static int stac92hd71bxx_connected_ports(struct hda_codec *codec,
+                                         hda_nid_t *nids, int num_nids)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int idx, num;
+        unsigned int def_conf;
+
+        for (num = 0; num < num_nids; num++) {
+                for (idx = 0; idx < spec->num_pins; idx++)
+                        if (spec->pin_nids[idx] == nids[num])
+                                break;
+                if (idx >= spec->num_pins)
+                        break;
+                def_conf = stac_get_defcfg_connect(codec, idx);
+                if (def_conf == AC_JACK_PORT_NONE)
+                        break;
+        }
+        return num;
+}
+
+static int stac92hd71bxx_connected_smuxes(struct hda_codec *codec,
+                                          hda_nid_t dig0pin)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int idx;
+
+        for (idx = 0; idx < spec->num_pins; idx++)
+                if (spec->pin_nids[idx] == dig0pin)
+                        break;
+        if ((idx + 2) >= spec->num_pins)
+                return 0;
+
+        /* dig1pin case */
+        if (stac_get_defcfg_connect(codec, idx + 1) != AC_JACK_PORT_NONE)
+                return 2;
+
+        /* dig0pin + dig2pin case */
+        if (stac_get_defcfg_connect(codec, idx + 2) != AC_JACK_PORT_NONE)
+                return 2;
+        if (stac_get_defcfg_connect(codec, idx) != AC_JACK_PORT_NONE)
+                return 1;
+        else
+                return 0;
+}
+
 static int patch_stac92hd71bxx(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec;
+        struct hda_verb *unmute_init = stac92hd71bxx_unmute_core_init;
         int err = 0;
+        unsigned int ndmic_nids = 0;
 
         spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -4879,27 +5028,32 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
 
         codec->spec = spec;
         codec->patch_ops = stac92xx_patch_ops;
-        spec->num_pins = ARRAY_SIZE(stac92hd71bxx_pin_nids);
+        spec->num_pins = STAC92HD71BXX_NUM_PINS;
+        switch (codec->vendor_id) {
+        case 0x111d76b6:
+        case 0x111d76b7:
+                spec->pin_nids = stac92hd71bxx_pin_nids_4port;
+                break;
+        case 0x111d7603:
+        case 0x111d7608:
+                /* On 92HD75Bx 0x27 isn't a pin nid */
+                spec->num_pins--;
+                /* fallthrough */
+        default:
+                spec->pin_nids = stac92hd71bxx_pin_nids_6port;
+        }
         spec->num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids);
-        spec->pin_nids = stac92hd71bxx_pin_nids;
-        memcpy(&spec->private_dimux, &stac92hd71bxx_dmux,
-                        sizeof(stac92hd71bxx_dmux));
         spec->board_config = snd_hda_check_board_config(codec,
                                                         STAC_92HD71BXX_MODELS,
                                                         stac92hd71bxx_models,
                                                         stac92hd71bxx_cfg_tbl);
 again:
-        if (spec->board_config < 0) {
+        if (spec->board_config < 0)
                 snd_printdd(KERN_INFO "hda_codec: Unknown model for"
                         " STAC92HD71BXX, using BIOS defaults\n");
-                err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
+        else
+                stac92xx_set_config_regs(codec,
                                 stac92hd71bxx_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
-        }
 
         if (spec->board_config > STAC_92HD71BXX_REF) {
                 /* GPIO0 = EAPD */
@@ -4908,16 +5062,34 @@ again:
                 spec->gpio_data = 0x01;
         }
 
+        spec->dmic_nids = stac92hd71bxx_dmic_nids;
+        spec->dmux_nids = stac92hd71bxx_dmux_nids;
+
         switch (codec->vendor_id) {
         case 0x111d76b6: /* 4 Port without Analog Mixer */
         case 0x111d76b7:
+                unmute_init++;
+                /* fallthru */
         case 0x111d76b4: /* 6 Port without Analog Mixer */
         case 0x111d76b5:
+                memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_nomixer,
+                       sizeof(stac92hd71bxx_dmux_nomixer));
                 spec->mixer = stac92hd71bxx_mixer;
                 spec->init = stac92hd71bxx_core_init;
                 codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
+                spec->num_dmics = stac92hd71bxx_connected_ports(codec,
+                                        stac92hd71bxx_dmic_nids,
+                                        STAC92HD71BXX_NUM_DMICS);
+                if (spec->num_dmics) {
+                        spec->num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids);
+                        spec->dinput_mux = &spec->private_dimux;
+                        ndmic_nids = ARRAY_SIZE(stac92hd71bxx_dmic_nids) - 1;
+                }
                 break;
         case 0x111d7608: /* 5 Port with Analog Mixer */
+                memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
+                       sizeof(stac92hd71bxx_dmux_amixer));
+                spec->private_dimux.num_items--;
                 switch (spec->board_config) {
                 case STAC_HP_M4:
                         /* Enable VREF power saving on GPIO1 detect */
@@ -4944,7 +5116,15 @@ again:
 
                 /* disable VSW */
                 spec->init = &stac92hd71bxx_analog_core_init[HD_DISABLE_PORTF];
-                stac_change_pin_config(codec, 0xf, 0x40f000f0);
+                unmute_init++;
+                snd_hda_codec_set_pincfg(codec, 0x0f, 0x40f000f0);
+                snd_hda_codec_set_pincfg(codec, 0x19, 0x40f000f3);
+                stac92hd71bxx_dmic_nids[STAC92HD71BXX_NUM_DMICS - 1] = 0;
+                spec->num_dmics = stac92hd71bxx_connected_ports(codec,
+                                        stac92hd71bxx_dmic_nids,
+                                        STAC92HD71BXX_NUM_DMICS - 1);
+                spec->num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids);
+                ndmic_nids = ARRAY_SIZE(stac92hd71bxx_dmic_nids) - 2;
                 break;
         case 0x111d7603: /* 6 Port with Analog Mixer */
                 if ((codec->revision_id & 0xf) == 1)
@@ -4954,12 +5134,23 @@ again:
                 spec->num_pwrs = 0;
                 /* fallthru */
         default:
+                memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
+                       sizeof(stac92hd71bxx_dmux_amixer));
                 spec->dinput_mux = &spec->private_dimux;
                 spec->mixer = stac92hd71bxx_analog_mixer;
                 spec->init = stac92hd71bxx_analog_core_init;
                 codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
+                spec->num_dmics = stac92hd71bxx_connected_ports(codec,
+                                        stac92hd71bxx_dmic_nids,
+                                        STAC92HD71BXX_NUM_DMICS);
+                spec->num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids);
+                ndmic_nids = ARRAY_SIZE(stac92hd71bxx_dmic_nids) - 1;
         }
 
+        if (get_wcaps(codec, 0xa) & AC_WCAP_IN_AMP)
+                snd_hda_sequence_write_cache(codec, unmute_init);
+
+        spec->aloopback_ctl = stac92hd71bxx_loopback;
         spec->aloopback_mask = 0x50;
         spec->aloopback_shift = 0;
 
@@ -4967,18 +5158,17 @@ again:
         spec->digbeep_nid = 0x26;
         spec->mux_nids = stac92hd71bxx_mux_nids;
         spec->adc_nids = stac92hd71bxx_adc_nids;
-        spec->dmic_nids = stac92hd71bxx_dmic_nids;
-        spec->dmux_nids = stac92hd71bxx_dmux_nids;
         spec->smux_nids = stac92hd71bxx_smux_nids;
         spec->pwr_nids = stac92hd71bxx_pwr_nids;
 
         spec->num_muxes = ARRAY_SIZE(stac92hd71bxx_mux_nids);
         spec->num_adcs = ARRAY_SIZE(stac92hd71bxx_adc_nids);
+        spec->num_smuxes = stac92hd71bxx_connected_smuxes(codec, 0x1e);
 
         switch (spec->board_config) {
         case STAC_HP_M4:
                 /* enable internal microphone */
-                stac_change_pin_config(codec, 0x0e, 0x01813040);
+                snd_hda_codec_set_pincfg(codec, 0x0e, 0x01813040);
                 stac92xx_auto_set_pinctl(codec, 0x0e,
                         AC_PINCTL_IN_EN | AC_PINCTL_VREF_80);
                 /* fallthru */
@@ -4993,19 +5183,36 @@ again:
                 spec->num_smuxes = 0;
                 spec->num_dmuxes = 1;
                 break;
-        default:
-                spec->num_dmics = STAC92HD71BXX_NUM_DMICS;
-                spec->num_smuxes = ARRAY_SIZE(stac92hd71bxx_smux_nids);
-                spec->num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids);
+        case STAC_HP_DV5:
+                snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010);
+                stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN);
+                break;
+        case STAC_HP_HDX:
+                spec->num_dmics = 1;
+                spec->num_dmuxes = 1;
+                spec->num_smuxes = 1;
+                /*
+                 * For controlling MUTE LED on HP HDX16/HDX18 notebooks,
+                 * the CONFIG_SND_HDA_POWER_SAVE is needed to be set.
+                 */
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+                /* orange/white mute led on GPIO3, orange=0, white=1 */
+                spec->gpio_mask |= 0x08;
+                spec->gpio_dir  |= 0x08;
+                spec->gpio_data |= 0x08;  /* set to white */
+
+                /* register check_power_status callback. */
+                codec->patch_ops.check_power_status =
+                    stac92xx_hp_hdx_check_power_status;
+#endif  
+                break;
         };
 
         spec->multiout.dac_nids = spec->dac_nids;
         if (spec->dinput_mux)
-                spec->private_dimux.num_items +=
-                        spec->num_dmics -
-                                (ARRAY_SIZE(stac92hd71bxx_dmic_nids) - 1);
+                spec->private_dimux.num_items += spec->num_dmics - ndmic_nids;
 
-        err = stac92xx_parse_auto_config(codec, 0x21, 0x23);
+        err = stac92xx_parse_auto_config(codec, 0x21, 0);
         if (!err) {
                 if (spec->board_config < 0) {
                         printk(KERN_WARNING "hda_codec: No auto-config is "
@@ -5080,17 +5287,12 @@ static int patch_stac922x(struct hda_codec *codec)
         }
 
  again:
-        if (spec->board_config < 0) {
+        if (spec->board_config < 0)
                 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, "
                         "using BIOS defaults\n");
-                err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
+        else
+                stac92xx_set_config_regs(codec,
                                 stac922x_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
-        }
 
         spec->adc_nids = stac922x_adc_nids;
         spec->mux_nids = stac922x_mux_nids;
@@ -5141,24 +5343,19 @@ static int patch_stac927x(struct hda_codec *codec)
                 return -ENOMEM;
 
         codec->spec = spec;
+        codec->slave_dig_outs = stac927x_slave_dig_outs;
         spec->num_pins = ARRAY_SIZE(stac927x_pin_nids);
         spec->pin_nids = stac927x_pin_nids;
         spec->board_config = snd_hda_check_board_config(codec, STAC_927X_MODELS,
                                                         stac927x_models,
                                                         stac927x_cfg_tbl);
  again:
-        if (spec->board_config < 0 || !stac927x_brd_tbl[spec->board_config]) {
-                if (spec->board_config < 0)
-                        snd_printdd(KERN_INFO "hda_codec: Unknown model for"
-                                    "STAC927x, using BIOS defaults\n");
-                err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
+        if (spec->board_config < 0)
+                snd_printdd(KERN_INFO "hda_codec: Unknown model for"
+                            "STAC927x, using BIOS defaults\n");
+        else
+                stac92xx_set_config_regs(codec,
                                 stac927x_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
-        }
 
         spec->digbeep_nid = 0x23;
         spec->adc_nids = stac927x_adc_nids;
@@ -5187,15 +5384,15 @@ static int patch_stac927x(struct hda_codec *codec)
                 case 0x10280209:
                 case 0x1028022e:
                         /* correct the device field to SPDIF out */
-                        stac_change_pin_config(codec, 0x21, 0x01442070);
+                        snd_hda_codec_set_pincfg(codec, 0x21, 0x01442070);
                         break;
                 };
                 /* configure the analog microphone on some laptops */
-                stac_change_pin_config(codec, 0x0c, 0x90a79130);
+                snd_hda_codec_set_pincfg(codec, 0x0c, 0x90a79130);
                 /* correct the front output jack as a hp out */
-                stac_change_pin_config(codec, 0x0f, 0x0227011f);
+                snd_hda_codec_set_pincfg(codec, 0x0f, 0x0227011f);
                 /* correct the front input jack as a mic */
-                stac_change_pin_config(codec, 0x0e, 0x02a79130);
+                snd_hda_codec_set_pincfg(codec, 0x0e, 0x02a79130);
                 /* fallthru */
         case STAC_DELL_3ST:
                 /* GPIO2 High = Enable EAPD */
@@ -5222,6 +5419,7 @@ static int patch_stac927x(struct hda_codec *codec)
         }
 
         spec->num_pwrs = 0;
+        spec->aloopback_ctl = stac927x_loopback;
         spec->aloopback_mask = 0x40;
         spec->aloopback_shift = 0;
         spec->eapd_switch = 1;
@@ -5280,16 +5478,11 @@ static int patch_stac9205(struct hda_codec *codec)
                                                         stac9205_models,
                                                         stac9205_cfg_tbl);
  again:
-        if (spec->board_config < 0) {
+        if (spec->board_config < 0)
                 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9205, using BIOS defaults\n");
-                err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
+        else
+                stac92xx_set_config_regs(codec,
                                          stac9205_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
-        }
 
         spec->digbeep_nid = 0x23;
         spec->adc_nids = stac9205_adc_nids;
@@ -5306,17 +5499,20 @@ static int patch_stac9205(struct hda_codec *codec)
 
         spec->init = stac9205_core_init;
         spec->mixer = stac9205_mixer;
+        spec->aloopback_ctl = stac9205_loopback;
 
         spec->aloopback_mask = 0x40;
         spec->aloopback_shift = 0;
-        spec->eapd_switch = 1;
+        /* Turn on/off EAPD per HP plugging */
+        if (spec->board_config != STAC_9205_EAPD)
+                spec->eapd_switch = 1;
         spec->multiout.dac_nids = spec->dac_nids;
         
         switch (spec->board_config){
         case STAC_9205_DELL_M43:
                 /* Enable SPDIF in/out */
-                stac_change_pin_config(codec, 0x1f, 0x01441030);
-                stac_change_pin_config(codec, 0x20, 0x1c410030);
+                snd_hda_codec_set_pincfg(codec, 0x1f, 0x01441030);
+                snd_hda_codec_set_pincfg(codec, 0x20, 0x1c410030);
 
                 /* Enable unsol response for GPIO4/Dock HP connection */
                 err = stac_add_event(spec, codec->afg, STAC_VREF_EVENT, 0x01);
@@ -5373,223 +5569,87 @@ static int patch_stac9205(struct hda_codec *codec)
  * STAC9872 hack
  */
 
-/* static config for Sony VAIO FE550G and Sony VAIO AR */
-static hda_nid_t vaio_dacs[] = { 0x2 };
-#define VAIO_HP_DAC     0x5
-static hda_nid_t vaio_adcs[] = { 0x8 /*,0x6*/ };
-static hda_nid_t vaio_mux_nids[] = { 0x15 };
-
-static struct hda_input_mux vaio_mux = {
-        .num_items = 3,
-        .items = {
-                /* { "HP", 0x0 }, */
-                { "Mic Jack", 0x1 },
-                { "Internal Mic", 0x2 },
-                { "PCM", 0x3 },
-        }
-};
-
-static struct hda_verb vaio_init[] = {
-        {0x0a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP }, /* HP <- 0x2 */
-        {0x0a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | STAC_HP_EVENT},
-        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* Speaker <- 0x5 */
-        {0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? (<- 0x2) */
-        {0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, /* CD */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? */
+static struct hda_verb stac9872_core_init[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x1}, /* mic-sel: 0a,0d,14,02 */
-        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* HP */
-        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Speaker */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* capture sw/vol -> 0x8 */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, /* CD-in -> 0x6 */
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Mic-in -> 0x9 */
         {}
 };
 
-static struct hda_verb vaio_ar_init[] = {
-        {0x0a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP }, /* HP <- 0x2 */
-        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* Speaker <- 0x5 */
-        {0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? (<- 0x2) */
-        {0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, /* CD */
-/*      {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },*/ /* Optical Out */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? */
-        {0x15, AC_VERB_SET_CONNECT_SEL, 0x1}, /* mic-sel: 0a,0d,14,02 */
-        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* HP */
-        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Speaker */
-/*      {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},*/ /* Optical Out */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* capture sw/vol -> 0x8 */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, /* CD-in -> 0x6 */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Mic-in -> 0x9 */
-        {}
-};
-
-static struct snd_kcontrol_new vaio_mixer[] = {
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x02, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x02, 0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x05, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Speaker Playback Switch", 0x05, 0, HDA_OUTPUT),
-        /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */
+static struct snd_kcontrol_new stac9872_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Capture Source",
-                .count = 1,
-                .info = stac92xx_mux_enum_info,
-                .get = stac92xx_mux_enum_get,
-                .put = stac92xx_mux_enum_put,
-        },
-        {}
+        { } /* end */
 };
 
-static struct snd_kcontrol_new vaio_ar_mixer[] = {
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x02, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x02, 0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x05, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Speaker Playback Switch", 0x05, 0, HDA_OUTPUT),
-        /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */
-        HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT),
-        /*HDA_CODEC_MUTE("Optical Out Switch", 0x10, 0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Optical Out Volume", 0x10, 0, HDA_OUTPUT),*/
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Capture Source",
-                .count = 1,
-                .info = stac92xx_mux_enum_info,
-                .get = stac92xx_mux_enum_get,
-                .put = stac92xx_mux_enum_put,
-        },
-        {}
+static hda_nid_t stac9872_pin_nids[] = {
+        0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+        0x11, 0x13, 0x14,
 };
 
-static struct hda_codec_ops stac9872_patch_ops = {
-        .build_controls = stac92xx_build_controls,
-        .build_pcms = stac92xx_build_pcms,
-        .init = stac92xx_init,
-        .free = stac92xx_free,
-#ifdef SND_HDA_NEEDS_RESUME
-        .resume = stac92xx_resume,
-#endif
+static hda_nid_t stac9872_adc_nids[] = {
+        0x8 /*,0x6*/
 };
 
-static int stac9872_vaio_init(struct hda_codec *codec)
-{
-        int err;
-
-        err = stac92xx_init(codec);
-        if (err < 0)
-                return err;
-        if (codec->patch_ops.unsol_event)
-                codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
-        return 0;
-}
-
-static void stac9872_vaio_hp_detect(struct hda_codec *codec, unsigned int res)
-{
-        if (get_pin_presence(codec, 0x0a)) {
-                stac92xx_reset_pinctl(codec, 0x0f, AC_PINCTL_OUT_EN);
-                stac92xx_set_pinctl(codec, 0x0a, AC_PINCTL_OUT_EN);
-        } else {
-                stac92xx_reset_pinctl(codec, 0x0a, AC_PINCTL_OUT_EN);
-                stac92xx_set_pinctl(codec, 0x0f, AC_PINCTL_OUT_EN);
-        }
-} 
-
-static void stac9872_vaio_unsol_event(struct hda_codec *codec, unsigned int res)
-{
-        switch (res >> 26) {
-        case STAC_HP_EVENT:
-                stac9872_vaio_hp_detect(codec, res);
-                break;
-        }
-}
-
-static struct hda_codec_ops stac9872_vaio_patch_ops = {
-        .build_controls = stac92xx_build_controls,
-        .build_pcms = stac92xx_build_pcms,
-        .init = stac9872_vaio_init,
-        .free = stac92xx_free,
-        .unsol_event = stac9872_vaio_unsol_event,
-#ifdef CONFIG_PM
-        .resume = stac92xx_resume,
-#endif
+static hda_nid_t stac9872_mux_nids[] = {
+        0x15
 };
 
-enum { /* FE and SZ series. id=0x83847661 and subsys=0x104D0700 or 104D1000. */
-       CXD9872RD_VAIO,
-       /* Unknown. id=0x83847662 and subsys=0x104D1200 or 104D1000. */
-       STAC9872AK_VAIO, 
-       /* Unknown. id=0x83847661 and subsys=0x104D1200. */
-       STAC9872K_VAIO,
-       /* AR Series. id=0x83847664 and subsys=104D1300 */
-       CXD9872AKD_VAIO,
-       STAC_9872_MODELS,
+static unsigned int stac9872_vaio_pin_configs[9] = {
+        0x03211020, 0x411111f0, 0x411111f0, 0x03a15030,
+        0x411111f0, 0x90170110, 0x411111f0, 0x411111f0,
+        0x90a7013e
 };
 
 static const char *stac9872_models[STAC_9872_MODELS] = {
-        [CXD9872RD_VAIO]        = "vaio",
-        [CXD9872AKD_VAIO]       = "vaio-ar",
+        [STAC_9872_AUTO] = "auto",
+        [STAC_9872_VAIO] = "vaio",
+};
+
+static unsigned int *stac9872_brd_tbl[STAC_9872_MODELS] = {
+        [STAC_9872_VAIO] = stac9872_vaio_pin_configs,
 };
 
 static struct snd_pci_quirk stac9872_cfg_tbl[] = {
-        SND_PCI_QUIRK(0x104d, 0x81e6, "Sony VAIO F/S", CXD9872RD_VAIO),
-        SND_PCI_QUIRK(0x104d, 0x81ef, "Sony VAIO F/S", CXD9872RD_VAIO),
-        SND_PCI_QUIRK(0x104d, 0x81fd, "Sony VAIO AR", CXD9872AKD_VAIO),
-        SND_PCI_QUIRK(0x104d, 0x8205, "Sony VAIO AR", CXD9872AKD_VAIO),
-        {}
+        {} /* terminator */
 };
 
 static int patch_stac9872(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec;
-        int board_config;
+        int err;
 
-        board_config = snd_hda_check_board_config(codec, STAC_9872_MODELS,
-                                                  stac9872_models,
-                                                  stac9872_cfg_tbl);
-        if (board_config < 0)
-                /* unknown config, let generic-parser do its job... */
-                return snd_hda_parse_generic_codec(codec);
-        
         spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
-
         codec->spec = spec;
-        switch (board_config) {
-        case CXD9872RD_VAIO:
-        case STAC9872AK_VAIO:
-        case STAC9872K_VAIO:
-                spec->mixer = vaio_mixer;
-                spec->init = vaio_init;
-                spec->multiout.max_channels = 2;
-                spec->multiout.num_dacs = ARRAY_SIZE(vaio_dacs);
-                spec->multiout.dac_nids = vaio_dacs;
-                spec->multiout.hp_nid = VAIO_HP_DAC;
-                spec->num_adcs = ARRAY_SIZE(vaio_adcs);
-                spec->adc_nids = vaio_adcs;
-                spec->num_pwrs = 0;
-                spec->input_mux = &vaio_mux;
-                spec->mux_nids = vaio_mux_nids;
-                codec->patch_ops = stac9872_vaio_patch_ops;
-                break;
-        
-        case CXD9872AKD_VAIO:
-                spec->mixer = vaio_ar_mixer;
-                spec->init = vaio_ar_init;
-                spec->multiout.max_channels = 2;
-                spec->multiout.num_dacs = ARRAY_SIZE(vaio_dacs);
-                spec->multiout.dac_nids = vaio_dacs;
-                spec->multiout.hp_nid = VAIO_HP_DAC;
-                spec->num_adcs = ARRAY_SIZE(vaio_adcs);
-                spec->num_pwrs = 0;
-                spec->adc_nids = vaio_adcs;
-                spec->input_mux = &vaio_mux;
-                spec->mux_nids = vaio_mux_nids;
-                codec->patch_ops = stac9872_patch_ops;
-                break;
-        }
 
+        spec->board_config = snd_hda_check_board_config(codec, STAC_9872_MODELS,
+                                                        stac9872_models,
+                                                        stac9872_cfg_tbl);
+        if (spec->board_config < 0)
+                snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9872, "
+                            "using BIOS defaults\n");
+        else
+                stac92xx_set_config_regs(codec,
+                                         stac9872_brd_tbl[spec->board_config]);
+
+        spec->num_pins = ARRAY_SIZE(stac9872_pin_nids);
+        spec->pin_nids = stac9872_pin_nids;
+        spec->multiout.dac_nids = spec->dac_nids;
+        spec->num_adcs = ARRAY_SIZE(stac9872_adc_nids);
+        spec->adc_nids = stac9872_adc_nids;
+        spec->num_muxes = ARRAY_SIZE(stac9872_mux_nids);
+        spec->mux_nids = stac9872_mux_nids;
+        spec->mixer = stac9872_mixer;
+        spec->init = stac9872_core_init;
+
+        err = stac92xx_parse_auto_config(codec, 0x10, 0x12);
+        if (err < 0) {
+                stac92xx_free(codec);
+                return -EINVAL;
+        }
+        spec->input_mux = &spec->private_imux;
+        codec->patch_ops = stac92xx_patch_ops;
         return 0;
 }
 
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index c761394cbe84..b25a5cc637d6 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1308,16 +1308,13 @@ static void vt1708_set_pinconfig_connect(struct hda_codec *codec, hda_nid_t nid)
         unsigned int def_conf;
         unsigned char seqassoc;
 
-        def_conf = snd_hda_codec_read(codec, nid, 0,
-                                      AC_VERB_GET_CONFIG_DEFAULT, 0);
+        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_write(codec, nid, 0,
-                                            AC_VERB_SET_CONFIG_DEFAULT_BYTES_3,
-                                            def_conf >> 24);
+                        snd_hda_codec_set_pincfg(codec, nid, def_conf);
                 }
         }
 
@@ -1354,7 +1351,7 @@ static int vt1708_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = VT1708_DIGOUT_NID;
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = VT1708_DIGIN_NID;
@@ -1827,7 +1824,7 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = VT1709_DIGOUT_NID;
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = VT1709_DIGIN_NID;
@@ -2371,7 +2368,7 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = VT1708B_DIGOUT_NID;
         if (spec->autocfg.dig_in_pin)
                 spec->dig_in_nid = VT1708B_DIGIN_NID;
@@ -2836,7 +2833,7 @@ static int vt1708S_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = VT1708S_DIGOUT_NID;
 
         spec->extra_dig_out_nid = 0x15;
@@ -3155,7 +3152,7 @@ static int vt1702_parse_auto_config(struct hda_codec *codec)
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
-        if (spec->autocfg.dig_out_pin)
+        if (spec->autocfg.dig_outs)
                 spec->multiout.dig_out_nid = VT1702_DIGOUT_NID;
 
         spec->extra_dig_out_nid = 0x1B;
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 58d7cda03de5..3dd63f1cda53 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -458,7 +458,7 @@ static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id)
                         u16 pbkstatus;
                         struct snd_pcm_substream *substream;
                         pbkstatus = inw(ICEDS(ice, INTSTAT));
-                        /* printk("pbkstatus = 0x%x\n", pbkstatus); */
+                        /* printk(KERN_DEBUG "pbkstatus = 0x%x\n", pbkstatus); */
                         for (idx = 0; idx < 6; idx++) {
                                 if ((pbkstatus & (3 << (idx * 2))) == 0)
                                         continue;
@@ -2648,9 +2648,9 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "ICE1712");
         strcpy(card->shortname, "ICEnsemble ICE1712");
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index bb8d8c766b9d..128510e77a78 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -241,6 +241,8 @@ get_rawmidi_substream(struct snd_ice1712 *ice, unsigned int stream)
                                 struct snd_rawmidi_substream, list);
 }
 
+static void enable_midi_irq(struct snd_ice1712 *ice, u8 flag, int enable);
+
 static void vt1724_midi_write(struct snd_ice1712 *ice)
 {
         struct snd_rawmidi_substream *s;
@@ -254,6 +256,11 @@ static void vt1724_midi_write(struct snd_ice1712 *ice)
                 for (i = 0; i < count; ++i)
                         outb(buffer[i], ICEREG1724(ice, MPU_DATA));
         }
+        /* mask irq when all bytes have been transmitted.
+         * enabled again in output_trigger when the new data comes in.
+         */
+        enable_midi_irq(ice, VT1724_IRQ_MPU_TX,
+                        !snd_rawmidi_transmit_empty(s));
 }
 
 static void vt1724_midi_read(struct snd_ice1712 *ice)
@@ -272,31 +279,34 @@ static void vt1724_midi_read(struct snd_ice1712 *ice)
         }
 }
 
-static void vt1724_enable_midi_irq(struct snd_rawmidi_substream *substream,
-                                   u8 flag, int enable)
+/* call with ice->reg_lock */
+static void enable_midi_irq(struct snd_ice1712 *ice, u8 flag, int enable)
 {
-        struct snd_ice1712 *ice = substream->rmidi->private_data;
-        u8 mask;
-
-        spin_lock_irq(&ice->reg_lock);
-        mask = inb(ICEREG1724(ice, IRQMASK));
+        u8 mask = inb(ICEREG1724(ice, IRQMASK));
         if (enable)
                 mask &= ~flag;
         else
                 mask |= flag;
         outb(mask, ICEREG1724(ice, IRQMASK));
+}
+
+static void vt1724_enable_midi_irq(struct snd_rawmidi_substream *substream,
+                                   u8 flag, int enable)
+{
+        struct snd_ice1712 *ice = substream->rmidi->private_data;
+
+        spin_lock_irq(&ice->reg_lock);
+        enable_midi_irq(ice, flag, enable);
         spin_unlock_irq(&ice->reg_lock);
 }
 
 static int vt1724_midi_output_open(struct snd_rawmidi_substream *s)
 {
-        vt1724_enable_midi_irq(s, VT1724_IRQ_MPU_TX, 1);
         return 0;
 }
 
 static int vt1724_midi_output_close(struct snd_rawmidi_substream *s)
 {
-        vt1724_enable_midi_irq(s, VT1724_IRQ_MPU_TX, 0);
         return 0;
 }
 
@@ -311,6 +321,7 @@ static void vt1724_midi_output_trigger(struct snd_rawmidi_substream *s, int up)
                 vt1724_midi_write(ice);
         } else {
                 ice->midi_output = 0;
+                enable_midi_irq(ice, VT1724_IRQ_MPU_TX, 0);
         }
         spin_unlock_irqrestore(&ice->reg_lock, flags);
 }
@@ -320,6 +331,7 @@ static void vt1724_midi_output_drain(struct snd_rawmidi_substream *s)
         struct snd_ice1712 *ice = s->rmidi->private_data;
         unsigned long timeout;
 
+        vt1724_enable_midi_irq(s, VT1724_IRQ_MPU_TX, 0);
         /* 32 bytes should be transmitted in less than about 12 ms */
         timeout = jiffies + msecs_to_jiffies(15);
         do {
@@ -389,24 +401,24 @@ static irqreturn_t snd_vt1724_interrupt(int irq, void *dev_id)
                 status &= status_mask;
                 if (status == 0)
                         break;
+                spin_lock(&ice->reg_lock);
                 if (++timeout > 10) {
                         status = inb(ICEREG1724(ice, IRQSTAT));
                         printk(KERN_ERR "ice1724: Too long irq loop, "
                                "status = 0x%x\n", status);
                         if (status & VT1724_IRQ_MPU_TX) {
                                 printk(KERN_ERR "ice1724: Disabling MPU_TX\n");
-                                outb(inb(ICEREG1724(ice, IRQMASK)) |
-                                     VT1724_IRQ_MPU_TX,
-                                     ICEREG1724(ice, IRQMASK));
+                                enable_midi_irq(ice, VT1724_IRQ_MPU_TX, 0);
                         }
+                        spin_unlock(&ice->reg_lock);
                         break;
                 }
                 handled = 1;
                 if (status & VT1724_IRQ_MPU_TX) {
-                        spin_lock(&ice->reg_lock);
                         if (ice->midi_output)
                                 vt1724_midi_write(ice);
-                        spin_unlock(&ice->reg_lock);
+                        else
+                                enable_midi_irq(ice, VT1724_IRQ_MPU_TX, 0);
                         /* Due to mysterical reasons, MPU_TX is always
                          * generated (and can't be cleared) when a PCM
                          * playback is going.  So let's ignore at the
@@ -415,15 +427,14 @@ static irqreturn_t snd_vt1724_interrupt(int irq, void *dev_id)
                         status_mask &= ~VT1724_IRQ_MPU_TX;
                 }
                 if (status & VT1724_IRQ_MPU_RX) {
-                        spin_lock(&ice->reg_lock);
                         if (ice->midi_input)
                                 vt1724_midi_read(ice);
                         else
                                 vt1724_midi_clear_rx(ice);
-                        spin_unlock(&ice->reg_lock);
                 }
                 /* ack MPU irq */
                 outb(status, ICEREG1724(ice, IRQSTAT));
+                spin_unlock(&ice->reg_lock);
                 if (status & VT1724_IRQ_MTPCM) {
                         /*
                          * Multi-track PCM
@@ -745,7 +756,14 @@ static int snd_vt1724_playback_pro_prepare(struct snd_pcm_substream *substream)
 
         spin_unlock_irq(&ice->reg_lock);
 
-        /* printk("pro prepare: ch = %d, addr = 0x%x, buffer = 0x%x, period = 0x%x\n", substream->runtime->channels, (unsigned int)substream->runtime->dma_addr, snd_pcm_lib_buffer_bytes(substream), snd_pcm_lib_period_bytes(substream)); */
+        /*
+        printk(KERN_DEBUG "pro prepare: ch = %d, addr = 0x%x, "
+               "buffer = 0x%x, period = 0x%x\n",
+               substream->runtime->channels,
+               (unsigned int)substream->runtime->dma_addr,
+               snd_pcm_lib_buffer_bytes(substream),
+               snd_pcm_lib_period_bytes(substream));
+        */
         return 0;
 }
 
@@ -2122,7 +2140,9 @@ unsigned char snd_vt1724_read_i2c(struct snd_ice1712 *ice,
         wait_i2c_busy(ice);
         val = inb(ICEREG1724(ice, I2C_DATA));
         mutex_unlock(&ice->i2c_mutex);
-        /* printk("i2c_read: [0x%x,0x%x] = 0x%x\n", dev, addr, val); */
+        /*
+        printk(KERN_DEBUG "i2c_read: [0x%x,0x%x] = 0x%x\n", dev, addr, val);
+        */
         return val;
 }
 
@@ -2131,7 +2151,9 @@ void snd_vt1724_write_i2c(struct snd_ice1712 *ice,
 {
         mutex_lock(&ice->i2c_mutex);
         wait_i2c_busy(ice);
-        /* printk("i2c_write: [0x%x,0x%x] = 0x%x\n", dev, addr, data); */
+        /*
+        printk(KERN_DEBUG "i2c_write: [0x%x,0x%x] = 0x%x\n", dev, addr, data);
+        */
         outb(addr, ICEREG1724(ice, I2C_BYTE_ADDR));
         outb(data, ICEREG1724(ice, I2C_DATA));
         outb(dev | VT1724_I2C_WRITE, ICEREG1724(ice, I2C_DEV_ADDR));
@@ -2456,9 +2478,9 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "ICE1724");
         strcpy(card->shortname, "ICEnsemble ICE1724");
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index c51659b9caf6..fd948bfd9aef 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -345,8 +345,9 @@ static int juli_mute_put(struct snd_kcontrol *kcontrol,
                         new_gpio =  old_gpio &
                                 ~((unsigned int) kcontrol->private_value);
         }
-        /* printk("JULI - mute/unmute: control_value: 0x%x, old_gpio: 0x%x, \
-                new_gpio 0x%x\n",
+        /* printk(KERN_DEBUG
+                "JULI - mute/unmute: control_value: 0x%x, old_gpio: 0x%x, "
+                "new_gpio 0x%x\n",
                 (unsigned int)ucontrol->value.integer.value[0], old_gpio,
                 new_gpio); */
         if (old_gpio != new_gpio) {
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c
index 48d3679292a7..2a8e5cd8f2d8 100644
--- a/sound/pci/ice1712/prodigy192.c
+++ b/sound/pci/ice1712/prodigy192.c
@@ -133,8 +133,10 @@ static int stac9460_dac_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
                 idx  = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id) + STAC946X_LF_VOLUME;
         /* due to possible conflicts with stac9460_set_rate_val, mutexing */
         mutex_lock(&spec->mute_mutex);
-        /*printk("Mute put: reg 0x%02x, ctrl value: 0x%02x\n", idx,
-                ucontrol->value.integer.value[0]);*/
+        /*
+        printk(KERN_DEBUG "Mute put: reg 0x%02x, ctrl value: 0x%02x\n", idx,
+               ucontrol->value.integer.value[0]);
+        */
         change = stac9460_dac_mute(ice, idx, ucontrol->value.integer.value[0]);
         mutex_unlock(&spec->mute_mutex);
         return change;
@@ -185,7 +187,10 @@ static int stac9460_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
         change = (ovol != nvol);
         if (change) {
                 ovol =  (0x7f - nvol) | (tmp & 0x80);
-                /*printk("DAC Volume: reg 0x%02x: 0x%02x\n", idx, ovol);*/
+                /*
+                printk(KERN_DEBUG "DAC Volume: reg 0x%02x: 0x%02x\n",
+                       idx, ovol);
+                */
                 stac9460_put(ice, idx, (0x7f - nvol) | (tmp & 0x80));
         }
         return change;
@@ -344,7 +349,7 @@ static void stac9460_set_rate_val(struct snd_ice1712 *ice, unsigned int rate)
         for (idx = 0; idx < 7 ; ++idx)
                 changed[idx] = stac9460_dac_mute(ice,
                                 STAC946X_MASTER_VOLUME + idx, 0);
-        /*printk("Rate change: %d, new MC: 0x%02x\n", rate, new);*/
+        /*printk(KERN_DEBUG "Rate change: %d, new MC: 0x%02x\n", rate, new);*/
         stac9460_put(ice, STAC946X_MASTER_CLOCKING, new);
         udelay(10);
         /* unmuting - only originally unmuted dacs -
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index e900cdc84849..57648810eaf1 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -689,7 +689,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich
                         bdbar[idx + 1] = cpu_to_le32(0x80000000 | /* interrupt on completion */
                                                      ichdev->fragsize >> ichdev->pos_shift);
 #if 0
-                        printk("bdbar[%i] = 0x%x [0x%x]\n",
+                        printk(KERN_DEBUG "bdbar[%i] = 0x%x [0x%x]\n",
                                idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
 #endif
                 }
@@ -701,8 +701,10 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich
         ichdev->lvi_frag = ICH_REG_LVI_MASK % ichdev->frags;
         ichdev->position = 0;
 #if 0
-        printk("lvi_frag = %i, frags = %i, period_size = 0x%x, period_size1 = 0x%x\n",
-                        ichdev->lvi_frag, ichdev->frags, ichdev->fragsize, ichdev->fragsize1);
+        printk(KERN_DEBUG "lvi_frag = %i, frags = %i, period_size = 0x%x, "
+               "period_size1 = 0x%x\n",
+               ichdev->lvi_frag, ichdev->frags, ichdev->fragsize,
+               ichdev->fragsize1);
 #endif
         /* clear interrupts */
         iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
@@ -768,7 +770,8 @@ static inline void snd_intel8x0_update(struct intel8x0 *chip, struct ichdev *ich
                 ichdev->lvi_frag %= ichdev->frags;
                 ichdev->bdbar[ichdev->lvi * 2] = cpu_to_le32(ichdev->physbuf + ichdev->lvi_frag * ichdev->fragsize1);
 #if 0
-        printk("new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, all = 0x%x, 0x%x\n",
+        printk(KERN_DEBUG "new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, "
+               "all = 0x%x, 0x%x\n",
                ichdev->lvi * 2, ichdev->bdbar[ichdev->lvi * 2],
                ichdev->bdbar[ichdev->lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),
                inl(port + 4), inb(port + ICH_REG_OFF_CR));
@@ -2287,23 +2290,23 @@ static void do_ali_reset(struct intel8x0 *chip)
         iputdword(chip, ICHREG(ALI_INTERRUPTSR), 0x00000000);
 }
 
-static int snd_intel8x0_ich_chip_init(struct intel8x0 *chip, int probing)
-{
-        unsigned long end_time;
-        unsigned int cnt, status, nstatus;
-        
-        /* put logic to right state */
-        /* first clear status bits */
-        status = ICH_RCS | ICH_MCINT | ICH_POINT | ICH_PIINT;
-        if (chip->device_type == DEVICE_NFORCE)
-                status |= ICH_NVSPINT;
-        cnt = igetdword(chip, ICHREG(GLOB_STA));
-        iputdword(chip, ICHREG(GLOB_STA), cnt & status);
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+static struct snd_pci_quirk ich_chip_reset_mode[] = {
+        SND_PCI_QUIRK(0x1014, 0x051f, "Thinkpad R32", 1),
+        { } /* end */
+};
 
+static int snd_intel8x0_ich_chip_cold_reset(struct intel8x0 *chip)
+{
+        unsigned int cnt;
         /* ACLink on, 2 channels */
+
+        if (snd_pci_quirk_lookup(chip->pci, ich_chip_reset_mode))
+                return -EIO;
+
         cnt = igetdword(chip, ICHREG(GLOB_CNT));
         cnt &= ~(ICH_ACLINK | ICH_PCM_246_MASK);
-#ifdef CONFIG_SND_AC97_POWER_SAVE
+
         /* do cold reset - the full ac97 powerdown may leave the controller
          * in a warm state but actually it cannot communicate with the codec.
          */
@@ -2312,22 +2315,58 @@ static int snd_intel8x0_ich_chip_init(struct intel8x0 *chip, int probing)
         udelay(10);
         iputdword(chip, ICHREG(GLOB_CNT), cnt | ICH_AC97COLD);
         msleep(1);
+        return 0;
+}
+#define snd_intel8x0_ich_chip_can_cold_reset(chip) \
+        (!snd_pci_quirk_lookup(chip->pci, ich_chip_reset_mode))
 #else
+#define snd_intel8x0_ich_chip_cold_reset(chip)  0
+#define snd_intel8x0_ich_chip_can_cold_reset(chip) (0)
+#endif
+
+static int snd_intel8x0_ich_chip_reset(struct intel8x0 *chip)
+{
+        unsigned long end_time;
+        unsigned int cnt;
+        /* ACLink on, 2 channels */
+        cnt = igetdword(chip, ICHREG(GLOB_CNT));
+        cnt &= ~(ICH_ACLINK | ICH_PCM_246_MASK);
         /* finish cold or do warm reset */
         cnt |= (cnt & ICH_AC97COLD) == 0 ? ICH_AC97COLD : ICH_AC97WARM;
         iputdword(chip, ICHREG(GLOB_CNT), cnt);
         end_time = (jiffies + (HZ / 4)) + 1;
         do {
                 if ((igetdword(chip, ICHREG(GLOB_CNT)) & ICH_AC97WARM) == 0)
-                        goto __ok;
+                        return 0;
                 schedule_timeout_uninterruptible(1);
         } while (time_after_eq(end_time, jiffies));
         snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n",
                    igetdword(chip, ICHREG(GLOB_CNT)));
         return -EIO;
+}
+
+static int snd_intel8x0_ich_chip_init(struct intel8x0 *chip, int probing)
+{
+        unsigned long end_time;
+        unsigned int status, nstatus;
+        unsigned int cnt;
+        int err;
+
+        /* put logic to right state */
+        /* first clear status bits */
+        status = ICH_RCS | ICH_MCINT | ICH_POINT | ICH_PIINT;
+        if (chip->device_type == DEVICE_NFORCE)
+                status |= ICH_NVSPINT;
+        cnt = igetdword(chip, ICHREG(GLOB_STA));
+        iputdword(chip, ICHREG(GLOB_STA), cnt & status);
+
+        if (snd_intel8x0_ich_chip_can_cold_reset(chip))
+                err = snd_intel8x0_ich_chip_cold_reset(chip);
+        else
+                err = snd_intel8x0_ich_chip_reset(chip);
+        if (err < 0)
+                return err;
 
-      __ok:
-#endif
         if (probing) {
                 /* wait for any codec ready status.
                  * Once it becomes ready it should remain ready
@@ -3058,9 +3097,9 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
         int err;
         struct shortname_table *name;
 
-        card = snd_card_new(index, id, THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         if (spdif_aclink < 0)
                 spdif_aclink = check_default_spdif_aclink(pci);
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 93449e464566..6ec0fc50d6be 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -411,7 +411,10 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic
                         bdbar[idx + 0] = cpu_to_le32(ichdev->physbuf + (((idx >> 1) * ichdev->fragsize) % ichdev->size));
                         bdbar[idx + 1] = cpu_to_le32(0x80000000 | /* interrupt on completion */
                                                      ichdev->fragsize >> chip->pcm_pos_shift);
-                        // printk("bdbar[%i] = 0x%x [0x%x]\n", idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
+                        /*
+                        printk(KERN_DEBUG "bdbar[%i] = 0x%x [0x%x]\n",
+                               idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
+                        */
                 }
                 ichdev->frags = ichdev->size / ichdev->fragsize;
         }
@@ -421,8 +424,10 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic
         ichdev->lvi_frag = ICH_REG_LVI_MASK % ichdev->frags;
         ichdev->position = 0;
 #if 0
-        printk("lvi_frag = %i, frags = %i, period_size = 0x%x, period_size1 = 0x%x\n",
-                        ichdev->lvi_frag, ichdev->frags, ichdev->fragsize, ichdev->fragsize1);
+        printk(KERN_DEBUG "lvi_frag = %i, frags = %i, period_size = 0x%x, "
+               "period_size1 = 0x%x\n",
+               ichdev->lvi_frag, ichdev->frags, ichdev->fragsize,
+               ichdev->fragsize1);
 #endif
         /* clear interrupts */
         iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
@@ -465,7 +470,8 @@ static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ic
                                                              ichdev->lvi_frag *
                                                              ichdev->fragsize1);
 #if 0
-                printk("new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, all = 0x%x, 0x%x\n",
+                printk(KERN_DEBUG "new: bdbar[%i] = 0x%x [0x%x], "
+                       "prefetch = %i, all = 0x%x, 0x%x\n",
                        ichdev->lvi * 2, ichdev->bdbar[ichdev->lvi * 2],
                        ichdev->bdbar[ichdev->lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),
                        inl(port + 4), inb(port + ICH_REG_OFF_CR));
@@ -1269,9 +1275,9 @@ static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
         int err;
         struct shortname_table *name;
 
-        card = snd_card_new(index, id, THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         strcpy(card->driver, "ICH-MODEM");
         strcpy(card->shortname, "Intel ICH");
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 5f8006b42750..8b79969034be 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -2443,9 +2443,9 @@ snd_korg1212_probe(struct pci_dev *pci,
                 dev++;
                 return -ENOENT;
         }
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         if ((err = snd_korg1212_create(card, pci, &korg1212)) < 0) {
                 snd_card_free(card);
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 59bbaf8f3e5b..70141548f251 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2691,9 +2691,9 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         switch (pci->device) {
         case PCI_DEVICE_ID_ESS_ALLEGRO:
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index bb162507fe6c..c1eb84a14c42 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1366,12 +1366,12 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
                 else
                         idx = index[dev] + i;
                 snprintf(tmpid, sizeof(tmpid), "%s-%d", id[dev] ? id[dev] : "MIXART", i);
-                card = snd_card_new(idx, tmpid, THIS_MODULE, 0);
+                err = snd_card_create(idx, tmpid, THIS_MODULE, 0, &card);
 
-                if (! card) {
+                if (err < 0) {
                         snd_printk(KERN_ERR "cannot allocate the card %d\n", i);
                         snd_mixart_free(mgr);
-                        return -ENOMEM;
+                        return err;
                 }
 
                 strcpy(card->driver, CARD_NAME);
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index 3782b52bc0e8..4cf4cd8c939c 100644
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -345,8 +345,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
         status_daught = readl_be( MIXART_MEM( mgr,MIXART_PSEUDOREG_DXLX_STATUS_OFFSET ));
 
         /* motherboard xilinx status 5 will say that the board is performing a reset */
-        if( status_xilinx == 5 ) {
-                snd_printk( KERN_ERR "miXart is resetting !\n");
+        if (status_xilinx == 5) {
+                snd_printk(KERN_ERR "miXart is resetting !\n");
                 return -EAGAIN; /* try again later */
         }
 
@@ -354,13 +354,14 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
         case MIXART_MOTHERBOARD_XLX_INDEX:
 
                 /* xilinx already loaded ? */ 
-                if( status_xilinx == 4 ) {
-                        snd_printk( KERN_DEBUG "xilinx is already loaded !\n");
+                if (status_xilinx == 4) {
+                        snd_printk(KERN_DEBUG "xilinx is already loaded !\n");
                         return 0;
                 }
                 /* the status should be 0 == "idle" */
-                if( status_xilinx != 0 ) {
-                        snd_printk( KERN_ERR "xilinx load error ! status = %d\n", status_xilinx);
+                if (status_xilinx != 0) {
+                        snd_printk(KERN_ERR "xilinx load error ! status = %d\n",
+                                   status_xilinx);
                         return -EIO; /* modprob -r may help ? */
                 }
 
@@ -389,21 +390,23 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
 
         case MIXART_MOTHERBOARD_ELF_INDEX:
 
-                if( status_elf == 4 ) {
-                        snd_printk( KERN_DEBUG "elf file already loaded !\n");
+                if (status_elf == 4) {
+                        snd_printk(KERN_DEBUG "elf file already loaded !\n");
                         return 0;
                 }
 
                 /* the status should be 0 == "idle" */
-                if( status_elf != 0 ) {
-                        snd_printk( KERN_ERR "elf load error ! status = %d\n", status_elf);
+                if (status_elf != 0) {
+                        snd_printk(KERN_ERR "elf load error ! status = %d\n",
+                                   status_elf);
                         return -EIO; /* modprob -r may help ? */
                 }
 
                 /* wait for xilinx status == 4 */
                 err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_MXLX_STATUS_OFFSET, 1, 4, 500); /* 5sec */
                 if (err < 0) {
-                        snd_printk( KERN_ERR "xilinx was not loaded or could not be started\n");
+                        snd_printk(KERN_ERR "xilinx was not loaded or "
+                                   "could not be started\n");
                         return err;
                 }
 
@@ -424,7 +427,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
                 /* wait for elf status == 4 */
                 err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_ELF_STATUS_OFFSET, 1, 4, 300); /* 3sec */
                 if (err < 0) {
-                        snd_printk( KERN_ERR "elf could not be started\n");
+                        snd_printk(KERN_ERR "elf could not be started\n");
                         return err;
                 }
 
@@ -437,15 +440,16 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
         default:
 
                 /* elf and xilinx should be loaded */
-                if( (status_elf != 4) || (status_xilinx != 4) ) {
-                        printk( KERN_ERR "xilinx or elf not successfully loaded\n");
+                if (status_elf != 4 || status_xilinx != 4) {
+                        printk(KERN_ERR "xilinx or elf not "
+                               "successfully loaded\n");
                         return -EIO; /* modprob -r may help ? */
                 }
 
                 /* wait for daughter detection != 0 */
                 err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DBRD_PRESENCE_OFFSET, 0, 0, 30); /* 300msec */
                 if (err < 0) {
-                        snd_printk( KERN_ERR "error starting elf file\n");
+                        snd_printk(KERN_ERR "error starting elf file\n");
                         return err;
                 }
 
@@ -460,8 +464,9 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
                         return -EINVAL;
 
                 /* daughter should be idle */
-                if( status_daught != 0 ) {
-                        printk( KERN_ERR "daughter load error ! status = %d\n", status_daught);
+                if (status_daught != 0) {
+                        printk(KERN_ERR "daughter load error ! status = %d\n",
+                               status_daught);
                         return -EIO; /* modprob -r may help ? */
                 }
  
@@ -480,7 +485,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
                 /* wait for status == 2 */
                 err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DXLX_STATUS_OFFSET, 1, 2, 30); /* 300msec */
                 if (err < 0) {
-                        snd_printk( KERN_ERR "daughter board load error\n");
+                        snd_printk(KERN_ERR "daughter board load error\n");
                         return err;
                 }
 
@@ -502,7 +507,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
         /* wait for daughter status == 3 */
         err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DXLX_STATUS_OFFSET, 1, 3, 300); /* 3sec */
         if (err < 0) {
-                snd_printk( KERN_ERR "daughter board could not be initialised\n");
+                snd_printk(KERN_ERR
+                           "daughter board could not be initialised\n");
                 return err;
         }
 
@@ -512,7 +518,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
         /* first communication with embedded */
         err = mixart_first_init(mgr);
         if (err < 0) {
-                snd_printk( KERN_ERR "miXart could not be set up\n");
+                snd_printk(KERN_ERR "miXart could not be set up\n");
                 return err;
         }
 
@@ -581,16 +587,6 @@ MODULE_FIRMWARE("mixart/miXart8AES.xlx");
 /* miXart hwdep interface id string */
 #define SND_MIXART_HWDEP_ID       "miXart Loader"
 
-static int mixart_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
-static int mixart_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
 static int mixart_hwdep_dsp_status(struct snd_hwdep *hw,
                                    struct snd_hwdep_dsp_status *info)
 {
@@ -643,8 +639,6 @@ int snd_mixart_setup_firmware(struct mixart_mgr *mgr)
 
         hw->iface = SNDRV_HWDEP_IFACE_MIXART;
         hw->private_data = mgr;
-        hw->ops.open = mixart_hwdep_open;
-        hw->ops.release = mixart_hwdep_release;
         hw->ops.dsp_status = mixart_hwdep_dsp_status;
         hw->ops.dsp_load = mixart_hwdep_dsp_load;
         hw->exclusive = 1;
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 50c9f8a05082..522a040855d4 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -1668,9 +1668,9 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci,
                 }
         }
 
-        card = snd_card_new(index, id, THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         switch (pci->device) {
         case PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO:
diff --git a/sound/pci/oxygen/hifier.c b/sound/pci/oxygen/hifier.c
index 1ab833f843eb..84ef13183419 100644
--- a/sound/pci/oxygen/hifier.c
+++ b/sound/pci/oxygen/hifier.c
@@ -45,6 +45,7 @@ MODULE_PARM_DESC(enable, "enable card");
 static struct pci_device_id hifier_ids[] __devinitdata = {
         { OXYGEN_PCI_SUBID(0x14c3, 0x1710) },
         { OXYGEN_PCI_SUBID(0x14c3, 0x1711) },
+        { OXYGEN_PCI_SUBID_BROKEN_EEPROM },
         { }
 };
 MODULE_DEVICE_TABLE(pci, hifier_ids);
@@ -151,7 +152,6 @@ static const struct oxygen_model model_hifier = {
         .shortname = "C-Media CMI8787",
         .longname = "C-Media Oxygen HD Audio",
         .chip = "CMI8788",
-        .owner = THIS_MODULE,
         .init = hifier_init,
         .control_filter = hifier_control_filter,
         .cleanup = hifier_cleanup,
@@ -173,6 +173,13 @@ static const struct oxygen_model model_hifier = {
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
+static int __devinit get_hifier_model(struct oxygen *chip,
+                                      const struct pci_device_id *id)
+{
+        chip->model = model_hifier;
+        return 0;
+}
+
 static int __devinit hifier_probe(struct pci_dev *pci,
                                   const struct pci_device_id *pci_id)
 {
@@ -185,7 +192,8 @@ static int __devinit hifier_probe(struct pci_dev *pci,
                 ++dev;
                 return -ENOENT;
         }
-        err = oxygen_pci_probe(pci, index[dev], id[dev], &model_hifier, 0);
+        err = oxygen_pci_probe(pci, index[dev], id[dev], THIS_MODULE,
+                               hifier_ids, get_hifier_model);
         if (err >= 0)
                 ++dev;
         return err;
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index de999c6d6dd3..72db4c39007f 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -1,5 +1,5 @@
 /*
- * C-Media CMI8788 driver for C-Media's reference design and for the X-Meridian
+ * C-Media CMI8788 driver for C-Media's reference design and similar models
  *
  * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
  *
@@ -26,6 +26,7 @@
  *
  * GPIO 0 -> DFS0 of AK5385
  * GPIO 1 -> DFS1 of AK5385
+ * GPIO 8 -> enable headphone amplifier on HT-Omega models
  */
 
 #include <linux/delay.h>
@@ -61,7 +62,8 @@ MODULE_PARM_DESC(enable, "enable card");
 enum {
         MODEL_CMEDIA_REF,       /* C-Media's reference design */
         MODEL_MERIDIAN,         /* AuzenTech X-Meridian */
-        MODEL_HALO,             /* HT-Omega Claro halo */
+        MODEL_CLARO,            /* HT-Omega Claro */
+        MODEL_CLARO_HALO,       /* HT-Omega Claro halo */
 };
 
 static struct pci_device_id oxygen_ids[] __devinitdata = {
@@ -74,8 +76,8 @@ static struct pci_device_id oxygen_ids[] __devinitdata = {
         { OXYGEN_PCI_SUBID(0x147a, 0xa017), .driver_data = MODEL_CMEDIA_REF },
         { OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF },
         { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN },
-        { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CMEDIA_REF },
-        { OXYGEN_PCI_SUBID(0x7284, 0x9781), .driver_data = MODEL_HALO },
+        { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CLARO },
+        { OXYGEN_PCI_SUBID(0x7284, 0x9781), .driver_data = MODEL_CLARO_HALO },
         { }
 };
 MODULE_DEVICE_TABLE(pci, oxygen_ids);
@@ -86,6 +88,8 @@ MODULE_DEVICE_TABLE(pci, oxygen_ids);
 #define GPIO_AK5385_DFS_DOUBLE  0x0001
 #define GPIO_AK5385_DFS_QUAD    0x0002
 
+#define GPIO_CLARO_HP           0x0100
+
 struct generic_data {
         u8 ak4396_ctl2;
         u16 saved_wm8785_registers[2];
@@ -196,10 +200,46 @@ static void meridian_init(struct oxygen *chip)
         ak5385_init(chip);
 }
 
+static void claro_enable_hp(struct oxygen *chip)
+{
+        msleep(300);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_CLARO_HP);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, GPIO_CLARO_HP);
+}
+
+static void claro_init(struct oxygen *chip)
+{
+        ak4396_init(chip);
+        wm8785_init(chip);
+        claro_enable_hp(chip);
+}
+
+static void claro_halo_init(struct oxygen *chip)
+{
+        ak4396_init(chip);
+        ak5385_init(chip);
+        claro_enable_hp(chip);
+}
+
 static void generic_cleanup(struct oxygen *chip)
 {
 }
 
+static void claro_disable_hp(struct oxygen *chip)
+{
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_CLARO_HP);
+}
+
+static void claro_cleanup(struct oxygen *chip)
+{
+        claro_disable_hp(chip);
+}
+
+static void claro_suspend(struct oxygen *chip)
+{
+        claro_disable_hp(chip);
+}
+
 static void generic_resume(struct oxygen *chip)
 {
         ak4396_registers_init(chip);
@@ -211,6 +251,12 @@ static void meridian_resume(struct oxygen *chip)
         ak4396_registers_init(chip);
 }
 
+static void claro_resume(struct oxygen *chip)
+{
+        ak4396_registers_init(chip);
+        claro_enable_hp(chip);
+}
+
 static void set_ak4396_params(struct oxygen *chip,
                               struct snd_pcm_hw_params *params)
 {
@@ -293,30 +339,10 @@ static void set_ak5385_params(struct oxygen *chip,
 
 static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
 
-static int generic_probe(struct oxygen *chip, unsigned long driver_data)
-{
-        if (driver_data == MODEL_MERIDIAN) {
-                chip->model.init = meridian_init;
-                chip->model.resume = meridian_resume;
-                chip->model.set_adc_params = set_ak5385_params;
-                chip->model.device_config = PLAYBACK_0_TO_I2S |
-                                            PLAYBACK_1_TO_SPDIF |
-                                            CAPTURE_0_FROM_I2S_2 |
-                                            CAPTURE_1_FROM_SPDIF;
-        }
-        if (driver_data == MODEL_MERIDIAN || driver_data == MODEL_HALO) {
-                chip->model.misc_flags = OXYGEN_MISC_MIDI;
-                chip->model.device_config |= MIDI_OUTPUT | MIDI_INPUT;
-        }
-        return 0;
-}
-
 static const struct oxygen_model model_generic = {
         .shortname = "C-Media CMI8788",
         .longname = "C-Media Oxygen HD Audio",
         .chip = "CMI8788",
-        .owner = THIS_MODULE,
-        .probe = generic_probe,
         .init = generic_init,
         .cleanup = generic_cleanup,
         .resume = generic_resume,
@@ -341,6 +367,42 @@ static const struct oxygen_model model_generic = {
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
+static int __devinit get_oxygen_model(struct oxygen *chip,
+                                      const struct pci_device_id *id)
+{
+        chip->model = model_generic;
+        switch (id->driver_data) {
+        case MODEL_MERIDIAN:
+                chip->model.init = meridian_init;
+                chip->model.resume = meridian_resume;
+                chip->model.set_adc_params = set_ak5385_params;
+                chip->model.device_config = PLAYBACK_0_TO_I2S |
+                                            PLAYBACK_1_TO_SPDIF |
+                                            CAPTURE_0_FROM_I2S_2 |
+                                            CAPTURE_1_FROM_SPDIF;
+                break;
+        case MODEL_CLARO:
+                chip->model.init = claro_init;
+                chip->model.cleanup = claro_cleanup;
+                chip->model.suspend = claro_suspend;
+                chip->model.resume = claro_resume;
+                break;
+        case MODEL_CLARO_HALO:
+                chip->model.init = claro_halo_init;
+                chip->model.cleanup = claro_cleanup;
+                chip->model.suspend = claro_suspend;
+                chip->model.resume = claro_resume;
+                chip->model.set_adc_params = set_ak5385_params;
+                break;
+        }
+        if (id->driver_data == MODEL_MERIDIAN ||
+            id->driver_data == MODEL_CLARO_HALO) {
+                chip->model.misc_flags = OXYGEN_MISC_MIDI;
+                chip->model.device_config |= MIDI_OUTPUT | MIDI_INPUT;
+        }
+        return 0;
+}
+
 static int __devinit generic_oxygen_probe(struct pci_dev *pci,
                                           const struct pci_device_id *pci_id)
 {
@@ -353,8 +415,8 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
                 ++dev;
                 return -ENOENT;
         }
-        err = oxygen_pci_probe(pci, index[dev], id[dev],
-                               &model_generic, pci_id->driver_data);
+        err = oxygen_pci_probe(pci, index[dev], id[dev], THIS_MODULE,
+                               oxygen_ids, get_oxygen_model);
         if (err >= 0)
                 ++dev;
         return err;
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h
index 19107c6307e5..bd615dbffadb 100644
--- a/sound/pci/oxygen/oxygen.h
+++ b/sound/pci/oxygen/oxygen.h
@@ -18,6 +18,8 @@
 
 #define OXYGEN_IO_SIZE  0x100
 
+#define OXYGEN_EEPROM_ID        0x434d  /* "CM" */
+
 /* model-specific configuration of outputs/inputs */
 #define PLAYBACK_0_TO_I2S       0x0001
      /* PLAYBACK_0_TO_AC97_0            not implemented */
@@ -49,7 +51,13 @@ enum {
         .subvendor = sv, \
         .subdevice = sd
 
+#define BROKEN_EEPROM_DRIVER_DATA ((unsigned long)-1)
+#define OXYGEN_PCI_SUBID_BROKEN_EEPROM \
+        OXYGEN_PCI_SUBID(PCI_VENDOR_ID_CMEDIA, 0x8788), \
+        .driver_data = BROKEN_EEPROM_DRIVER_DATA
+
 struct pci_dev;
+struct pci_device_id;
 struct snd_card;
 struct snd_pcm_substream;
 struct snd_pcm_hardware;
@@ -62,8 +70,6 @@ struct oxygen_model {
         const char *shortname;
         const char *longname;
         const char *chip;
-        struct module *owner;
-        int (*probe)(struct oxygen *chip, unsigned long driver_data);
         void (*init)(struct oxygen *chip);
         int (*control_filter)(struct snd_kcontrol_new *template);
         int (*mixer_init)(struct oxygen *chip);
@@ -83,6 +89,7 @@ struct oxygen_model {
         void (*ac97_switch)(struct oxygen *chip,
                             unsigned int reg, unsigned int mute);
         const unsigned int *dac_tlv;
+        unsigned long private_data;
         size_t model_data_size;
         unsigned int device_config;
         u8 dac_channels;
@@ -134,8 +141,12 @@ struct oxygen {
 /* oxygen_lib.c */
 
 int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
-                     const struct oxygen_model *model,
-                     unsigned long driver_data);
+                     struct module *owner,
+                     const struct pci_device_id *ids,
+                     int (*get_model)(struct oxygen *chip,
+                                      const struct pci_device_id *id
+                                     )
+                    );
 void oxygen_pci_remove(struct pci_dev *pci);
 #ifdef CONFIG_PM
 int oxygen_pci_suspend(struct pci_dev *pci, pm_message_t state);
@@ -180,6 +191,9 @@ void oxygen_write_i2c(struct oxygen *chip, u8 device, u8 map, u8 data);
 void oxygen_reset_uart(struct oxygen *chip);
 void oxygen_write_uart(struct oxygen *chip, u8 data);
 
+u16 oxygen_read_eeprom(struct oxygen *chip, unsigned int index);
+void oxygen_write_eeprom(struct oxygen *chip, unsigned int index, u16 value);
+
 static inline void oxygen_set_bits8(struct oxygen *chip,
                                     unsigned int reg, u8 value)
 {
diff --git a/sound/pci/oxygen/oxygen_io.c b/sound/pci/oxygen/oxygen_io.c
index 3126c4b403dd..c1eb923f2ac9 100644
--- a/sound/pci/oxygen/oxygen_io.c
+++ b/sound/pci/oxygen/oxygen_io.c
@@ -254,3 +254,34 @@ void oxygen_write_uart(struct oxygen *chip, u8 data)
         _write_uart(chip, 0, data);
 }
 EXPORT_SYMBOL(oxygen_write_uart);
+
+u16 oxygen_read_eeprom(struct oxygen *chip, unsigned int index)
+{
+        unsigned int timeout;
+
+        oxygen_write8(chip, OXYGEN_EEPROM_CONTROL,
+                      index | OXYGEN_EEPROM_DIR_READ);
+        for (timeout = 0; timeout < 100; ++timeout) {
+                udelay(1);
+                if (!(oxygen_read8(chip, OXYGEN_EEPROM_STATUS)
+                      & OXYGEN_EEPROM_BUSY))
+                        break;
+        }
+        return oxygen_read16(chip, OXYGEN_EEPROM_DATA);
+}
+
+void oxygen_write_eeprom(struct oxygen *chip, unsigned int index, u16 value)
+{
+        unsigned int timeout;
+
+        oxygen_write16(chip, OXYGEN_EEPROM_DATA, value);
+        oxygen_write8(chip, OXYGEN_EEPROM_CONTROL,
+                      index | OXYGEN_EEPROM_DIR_WRITE);
+        for (timeout = 0; timeout < 10; ++timeout) {
+                msleep(1);
+                if (!(oxygen_read8(chip, OXYGEN_EEPROM_STATUS)
+                      & OXYGEN_EEPROM_BUSY))
+                        return;
+        }
+        snd_printk(KERN_ERR "EEPROM write timeout\n");
+}
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 84f481d41efa..312251d39696 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -34,6 +34,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("C-Media CMI8788 helper library");
 MODULE_LICENSE("GPL v2");
 
+#define DRIVER "oxygen"
 
 static inline int oxygen_uart_input_ready(struct oxygen *chip)
 {
@@ -243,6 +244,62 @@ static void oxygen_proc_init(struct oxygen *chip)
 #define oxygen_proc_init(chip)
 #endif
 
+static const struct pci_device_id *
+oxygen_search_pci_id(struct oxygen *chip, const struct pci_device_id ids[])
+{
+        u16 subdevice;
+
+        /*
+         * Make sure the EEPROM pins are available, i.e., not used for SPI.
+         * (This function is called before we initialize or use SPI.)
+         */
+        oxygen_clear_bits8(chip, OXYGEN_FUNCTION,
+                           OXYGEN_FUNCTION_ENABLE_SPI_4_5);
+        /*
+         * Read the subsystem device ID directly from the EEPROM, because the
+         * chip didn't if the first EEPROM word was overwritten.
+         */
+        subdevice = oxygen_read_eeprom(chip, 2);
+        /*
+         * We use only the subsystem device ID for searching because it is
+         * unique even without the subsystem vendor ID, which may have been
+         * overwritten in the EEPROM.
+         */
+        for (; ids->vendor; ++ids)
+                if (ids->subdevice == subdevice &&
+                    ids->driver_data != BROKEN_EEPROM_DRIVER_DATA)
+                        return ids;
+        return NULL;
+}
+
+static void oxygen_restore_eeprom(struct oxygen *chip,
+                                  const struct pci_device_id *id)
+{
+        if (oxygen_read_eeprom(chip, 0) != OXYGEN_EEPROM_ID) {
+                /*
+                 * This function gets called only when a known card model has
+                 * been detected, i.e., we know there is a valid subsystem
+                 * product ID at index 2 in the EEPROM.  Therefore, we have
+                 * been able to deduce the correct subsystem vendor ID, and
+                 * this is enough information to restore the original EEPROM
+                 * contents.
+                 */
+                oxygen_write_eeprom(chip, 1, id->subvendor);
+                oxygen_write_eeprom(chip, 0, OXYGEN_EEPROM_ID);
+
+                oxygen_set_bits8(chip, OXYGEN_MISC,
+                                 OXYGEN_MISC_WRITE_PCI_SUBID);
+                pci_write_config_word(chip->pci, PCI_SUBSYSTEM_VENDOR_ID,
+                                      id->subvendor);
+                pci_write_config_word(chip->pci, PCI_SUBSYSTEM_ID,
+                                      id->subdevice);
+                oxygen_clear_bits8(chip, OXYGEN_MISC,
+                                   OXYGEN_MISC_WRITE_PCI_SUBID);
+
+                snd_printk(KERN_INFO "EEPROM ID restored\n");
+        }
+}
+
 static void oxygen_init(struct oxygen *chip)
 {
         unsigned int i;
@@ -446,30 +503,33 @@ static void oxygen_card_free(struct snd_card *card)
                 free_irq(chip->irq, chip);
         flush_scheduled_work();
         chip->model.cleanup(chip);
+        kfree(chip->model_data);
         mutex_destroy(&chip->mutex);
         pci_release_regions(chip->pci);
         pci_disable_device(chip->pci);
 }
 
 int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
-                     const struct oxygen_model *model,
-                     unsigned long driver_data)
+                     struct module *owner,
+                     const struct pci_device_id *ids,
+                     int (*get_model)(struct oxygen *chip,
+                                      const struct pci_device_id *id
+                                     )
+                    )
 {
         struct snd_card *card;
         struct oxygen *chip;
+        const struct pci_device_id *pci_id;
         int err;
 
-        card = snd_card_new(index, id, model->owner,
-                            sizeof *chip + model->model_data_size);
-        if (!card)
-                return -ENOMEM;
+        err = snd_card_create(index, id, owner, sizeof(*chip), &card);
+        if (err < 0)
+                return err;
 
         chip = card->private_data;
         chip->card = card;
         chip->pci = pci;
         chip->irq = -1;
-        chip->model = *model;
-        chip->model_data = chip + 1;
         spin_lock_init(&chip->reg_lock);
         mutex_init(&chip->mutex);
         INIT_WORK(&chip->spdif_input_bits_work,
@@ -481,7 +541,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
         if (err < 0)
                 goto err_card;
 
-        err = pci_request_regions(pci, model->chip);
+        err = pci_request_regions(pci, DRIVER);
         if (err < 0) {
                 snd_printk(KERN_ERR "cannot reserve PCI resources\n");
                 goto err_pci_enable;
@@ -495,20 +555,34 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
         }
         chip->addr = pci_resource_start(pci, 0);
 
+        pci_id = oxygen_search_pci_id(chip, ids);
+        if (!pci_id) {
+                err = -ENODEV;
+                goto err_pci_regions;
+        }
+        oxygen_restore_eeprom(chip, pci_id);
+        err = get_model(chip, pci_id);
+        if (err < 0)
+                goto err_pci_regions;
+
+        if (chip->model.model_data_size) {
+                chip->model_data = kzalloc(chip->model.model_data_size,
+                                           GFP_KERNEL);
+                if (!chip->model_data) {
+                        err = -ENOMEM;
+                        goto err_pci_regions;
+                }
+        }
+
         pci_set_master(pci);
         snd_card_set_dev(card, &pci->dev);
         card->private_free = oxygen_card_free;
 
-        if (chip->model.probe) {
-                err = chip->model.probe(chip, driver_data);
-                if (err < 0)
-                        goto err_card;
-        }
         oxygen_init(chip);
         chip->model.init(chip);
 
         err = request_irq(pci->irq, oxygen_interrupt, IRQF_SHARED,
-                          chip->model.chip, chip);
+                          DRIVER, chip);
         if (err < 0) {
                 snd_printk(KERN_ERR "cannot grab interrupt %d\n", pci->irq);
                 goto err_card;
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 6c870c12a177..bc5ce11c8b14 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -112,6 +112,34 @@
  * CS4362A: AD0 <- 0
  */
 
+/*
+ * Xonar Essence 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>
@@ -152,6 +180,7 @@ enum {
         MODEL_DX,
         MODEL_HDAV,     /* without daughterboard */
         MODEL_HDAV_H6,  /* with H6 daughterboard */
+        MODEL_STX,
 };
 
 static struct pci_device_id xonar_ids[] __devinitdata = {
@@ -160,6 +189,8 @@ static struct pci_device_id xonar_ids[] __devinitdata = {
         { OXYGEN_PCI_SUBID(0x1043, 0x82b7), .driver_data = MODEL_D2X },
         { OXYGEN_PCI_SUBID(0x1043, 0x8314), .driver_data = MODEL_HDAV },
         { OXYGEN_PCI_SUBID(0x1043, 0x834f), .driver_data = MODEL_D1 },
+        { OXYGEN_PCI_SUBID(0x1043, 0x835c), .driver_data = MODEL_STX },
+        { OXYGEN_PCI_SUBID_BROKEN_EEPROM },
         { }
 };
 MODULE_DEVICE_TABLE(pci, xonar_ids);
@@ -183,12 +214,14 @@ MODULE_DEVICE_TABLE(pci, xonar_ids);
 #define GPIO_HDAV_DB_H6         0x0000
 #define GPIO_HDAV_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 model;
         unsigned int anti_pop_delay;
         unsigned int dacs;
         u16 output_enable_bit;
@@ -334,15 +367,9 @@ 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;
-        if (data->model == MODEL_D2X) {
-                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);
-        }
 
         pcm1796_init(chip);
 
@@ -355,6 +382,18 @@ static void xonar_d2_init(struct oxygen *chip)
         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;
@@ -422,11 +461,6 @@ static void xonar_d1_init(struct oxygen *chip)
         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;
-        if (data->model == MODEL_DX) {
-                data->ext_power_reg = OXYGEN_GPI_DATA;
-                data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
-                data->ext_power_bit = GPI_DX_EXT_POWER;
-        }
 
         oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
                        OXYGEN_2WIRE_LENGTH_8 |
@@ -447,6 +481,17 @@ static void xonar_d1_init(struct oxygen *chip)
         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;
@@ -458,6 +503,7 @@ static void xonar_hdav_init(struct oxygen *chip)
                        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;
@@ -484,6 +530,36 @@ static void xonar_hdav_init(struct oxygen *chip)
         snd_component_add(chip->card, "CS5381");
 }
 
+static void xonar_stx_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);
+
+        data->anti_pop_delay = 100;
+        data->dacs = 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 | 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_disable_output(struct oxygen *chip)
 {
         struct xonar_data *data = chip->model_data;
@@ -511,6 +587,11 @@ static void xonar_hdav_cleanup(struct oxygen *chip)
         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);
@@ -527,6 +608,11 @@ static void xonar_hdav_suspend(struct oxygen *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);
@@ -554,6 +640,12 @@ static void xonar_hdav_resume(struct oxygen *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)
 {
@@ -733,6 +825,72 @@ static const struct snd_kcontrol_new front_panel_switch = {
         .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)
 {
@@ -745,8 +903,8 @@ static void xonar_line_mic_ac97_switch(struct oxygen *chip,
         }
 }
 
-static const DECLARE_TLV_DB_SCALE(pcm1796_db_scale, -12000, 50, 0);
-static const DECLARE_TLV_DB_SCALE(cs4362a_db_scale, -12700, 100, 0);
+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)
 {
@@ -763,6 +921,15 @@ static int xonar_d1_control_filter(struct snd_kcontrol_new *template)
         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));
@@ -773,51 +940,14 @@ 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_model_probe(struct oxygen *chip, unsigned long driver_data)
+static int xonar_st_mixer_init(struct oxygen *chip)
 {
-        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",
-        };
-        static const u8 dacs[] = {
-                [MODEL_D1]      = 2,
-                [MODEL_DX]      = 2,
-                [MODEL_D2]      = 4,
-                [MODEL_D2X]     = 4,
-                [MODEL_HDAV]    = 1,
-                [MODEL_HDAV_H6] = 4,
-        };
-        struct xonar_data *data = chip->model_data;
-
-        data->model = driver_data;
-        if (data->model == MODEL_HDAV) {
-                oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL,
-                                    GPIO_HDAV_DB_MASK);
-                switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) &
-                        GPIO_HDAV_DB_MASK) {
-                case GPIO_HDAV_DB_H6:
-                        data->model = MODEL_HDAV_H6;
-                        break;
-                case GPIO_HDAV_DB_XX:
-                        snd_printk(KERN_ERR "unknown daughterboard\n");
-                        return -ENODEV;
-                }
-        }
-
-        data->dacs = dacs[data->model];
-        chip->model.shortname = names[data->model];
-        return 0;
+        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",
-        .owner = THIS_MODULE,
-        .probe = xonar_model_probe,
         .init = xonar_d2_init,
         .control_filter = xonar_d2_control_filter,
         .mixer_init = xonar_d2_mixer_init,
@@ -837,8 +967,8 @@ static const struct oxygen_model model_xonar_d2 = {
                          MIDI_OUTPUT |
                          MIDI_INPUT,
         .dac_channels = 8,
-        .dac_volume_min = 0x0f,
-        .dac_volume_max = 0xff,
+        .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,
@@ -849,8 +979,6 @@ static const struct oxygen_model model_xonar_d2 = {
 static const struct oxygen_model model_xonar_d1 = {
         .longname = "Asus Virtuoso 100",
         .chip = "AV200",
-        .owner = THIS_MODULE,
-        .probe = xonar_model_probe,
         .init = xonar_d1_init,
         .control_filter = xonar_d1_control_filter,
         .mixer_init = xonar_d1_mixer_init,
@@ -868,7 +996,7 @@ static const struct oxygen_model model_xonar_d1 = {
                          PLAYBACK_1_TO_SPDIF |
                          CAPTURE_0_FROM_I2S_2,
         .dac_channels = 8,
-        .dac_volume_min = 0,
+        .dac_volume_min = 127 - 60,
         .dac_volume_max = 127,
         .function_flags = OXYGEN_FUNCTION_2WIRE,
         .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
@@ -878,8 +1006,6 @@ static const struct oxygen_model model_xonar_d1 = {
 static const struct oxygen_model model_xonar_hdav = {
         .longname = "Asus Virtuoso 200",
         .chip = "AV200",
-        .owner = THIS_MODULE,
-        .probe = xonar_model_probe,
         .init = xonar_hdav_init,
         .cleanup = xonar_hdav_cleanup,
         .suspend = xonar_hdav_suspend,
@@ -897,16 +1023,43 @@ static const struct oxygen_model model_xonar_hdav = {
                          PLAYBACK_1_TO_SPDIF |
                          CAPTURE_0_FROM_I2S_2,
         .dac_channels = 8,
-        .dac_volume_min = 0x0f,
-        .dac_volume_max = 0xff,
+        .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 int __devinit xonar_probe(struct pci_dev *pci,
-                                 const struct pci_device_id *pci_id)
+static const struct oxygen_model model_xonar_st = {
+        .longname = "Asus Virtuoso 100",
+        .chip = "AV200",
+        .init = xonar_stx_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,
@@ -914,7 +1067,57 @@ static int __devinit xonar_probe(struct pci_dev *pci,
                 [MODEL_D2]      = &model_xonar_d2,
                 [MODEL_D2X]     = &model_xonar_d2,
                 [MODEL_HDAV]    = &model_xonar_hdav,
+                [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_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_HDAV_DB_MASK);
+                switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) &
+                        GPIO_HDAV_DB_MASK) {
+                case GPIO_HDAV_DB_H6:
+                        model = MODEL_HDAV_H6;
+                        break;
+                case GPIO_HDAV_DB_XX:
+                        snd_printk(KERN_ERR "unknown daughterboard\n");
+                        return -ENODEV;
+                }
+                break;
+        case MODEL_STX:
+                oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL,
+                                    GPIO_HDAV_DB_MASK);
+                break;
+        }
+
+        chip->model.shortname = names[model];
+        chip->model.private_data = model;
+        return 0;
+}
+
+static int __devinit xonar_probe(struct pci_dev *pci,
+                                 const struct pci_device_id *pci_id)
+{
         static int dev;
         int err;
 
@@ -924,10 +1127,8 @@ static int __devinit xonar_probe(struct pci_dev *pci,
                 ++dev;
                 return -ENOENT;
         }
-        BUG_ON(pci_id->driver_data >= ARRAY_SIZE(models));
-        err = oxygen_pci_probe(pci, index[dev], id[dev],
-                               models[pci_id->driver_data],
-                               pci_id->driver_data);
+        err = oxygen_pci_probe(pci, index[dev], id[dev], THIS_MODULE,
+                               xonar_ids, get_xonar_model);
         if (err >= 0)
                 ++dev;
         return err;
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 27cf2c28d113..80e064a3efff 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1334,6 +1334,40 @@ static void pcxhr_proc_sync(struct snd_info_entry *entry,
         snd_iprintf(buffer, "\n");
 }
 
+static void pcxhr_proc_gpio_read(struct snd_info_entry *entry,
+                                 struct snd_info_buffer *buffer)
+{
+        struct snd_pcxhr *chip = entry->private_data;
+        struct pcxhr_mgr *mgr = chip->mgr;
+        /* commands available when embedded DSP is running */
+        if (mgr->dsp_loaded & (1 << PCXHR_FIRMWARE_DSP_MAIN_INDEX)) {
+                /* gpio ports on stereo boards only available */
+                int value = 0;
+                hr222_read_gpio(mgr, 1, &value);        /* GPI */
+                snd_iprintf(buffer, "GPI: 0x%x\n", value);
+                hr222_read_gpio(mgr, 0, &value);        /* GP0 */
+                snd_iprintf(buffer, "GPO: 0x%x\n", value);
+        } else
+                snd_iprintf(buffer, "no firmware loaded\n");
+        snd_iprintf(buffer, "\n");
+}
+static void pcxhr_proc_gpo_write(struct snd_info_entry *entry,
+                                 struct snd_info_buffer *buffer)
+{
+        struct snd_pcxhr *chip = entry->private_data;
+        struct pcxhr_mgr *mgr = chip->mgr;
+        char line[64];
+        int value;
+        /* commands available when embedded DSP is running */
+        if (!(mgr->dsp_loaded & (1 << PCXHR_FIRMWARE_DSP_MAIN_INDEX)))
+                return;
+        while (!snd_info_get_line(buffer, line, sizeof(line))) {
+                if (sscanf(line, "GPO: 0x%x", &value) != 1)
+                        continue;
+                hr222_write_gpo(mgr, value);    /* GP0 */
+        }
+}
+
 static void __devinit pcxhr_proc_init(struct snd_pcxhr *chip)
 {
         struct snd_info_entry *entry;
@@ -1342,6 +1376,13 @@ static void __devinit pcxhr_proc_init(struct snd_pcxhr *chip)
                 snd_info_set_text_ops(entry, chip, pcxhr_proc_info);
         if (! snd_card_proc_new(chip->card, "sync", &entry))
                 snd_info_set_text_ops(entry, chip, pcxhr_proc_sync);
+        /* gpio available on stereo sound cards only */
+        if (chip->mgr->is_hr_stereo &&
+            !snd_card_proc_new(chip->card, "gpio", &entry)) {
+                snd_info_set_text_ops(entry, chip, pcxhr_proc_gpio_read);
+                entry->c.text.write = pcxhr_proc_gpo_write;
+                entry->mode |= S_IWUSR;
+        }
 }
 /* end of proc interface */
 
@@ -1510,12 +1551,12 @@ static int __devinit pcxhr_probe(struct pci_dev *pci,
 
                 snprintf(tmpid, sizeof(tmpid), "%s-%d",
                          id[dev] ? id[dev] : card_name, i);
-                card = snd_card_new(idx, tmpid, THIS_MODULE, 0);
+                err = snd_card_create(idx, tmpid, THIS_MODULE, 0, &card);
 
-                if (! card) {
+                if (err < 0) {
                         snd_printk(KERN_ERR "cannot allocate the card %d\n", i);
                         pcxhr_free(mgr);
-                        return -ENOMEM;
+                        return err;
                 }
 
                 strcpy(card->driver, DRIVER_NAME);
diff --git a/sound/pci/pcxhr/pcxhr.h b/sound/pci/pcxhr/pcxhr.h
index 69d87dee6995..bda776c49884 100644
--- a/sound/pci/pcxhr/pcxhr.h
+++ b/sound/pci/pcxhr/pcxhr.h
@@ -27,8 +27,8 @@
 #include <linux/mutex.h>
 #include <sound/pcm.h>
 
-#define PCXHR_DRIVER_VERSION            0x000905        /* 0.9.5 */
-#define PCXHR_DRIVER_VERSION_STRING     "0.9.5"         /* 0.9.5 */
+#define PCXHR_DRIVER_VERSION            0x000906        /* 0.9.6 */
+#define PCXHR_DRIVER_VERSION_STRING     "0.9.6"         /* 0.9.6 */
 
 
 #define PCXHR_MAX_CARDS         6
@@ -124,6 +124,7 @@ struct pcxhr_mgr {
 
         unsigned char xlx_cfg;          /* copy of PCXHR_XLX_CFG register */
         unsigned char xlx_selmic;       /* copy of PCXHR_XLX_SELMIC register */
+        unsigned char dsp_reset;        /* copy of PCXHR_DSP_RESET register */
 };
 
 
diff --git a/sound/pci/pcxhr/pcxhr_core.h b/sound/pci/pcxhr/pcxhr_core.h
index bbbd66d13a64..be0173796cdb 100644
--- a/sound/pci/pcxhr/pcxhr_core.h
+++ b/sound/pci/pcxhr/pcxhr_core.h
@@ -1,7 +1,7 @@
 /*
  * Driver for Digigram pcxhr compatible soundcards
  *
- * low level interface with interrupt ans message handling
+ * low level interface with interrupt and message handling
  *
  * Copyright (c) 2004 by Digigram <alsa@digigram.com>
  *
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c
index 592743a298b0..17cb1233a903 100644
--- a/sound/pci/pcxhr/pcxhr_hwdep.c
+++ b/sound/pci/pcxhr/pcxhr_hwdep.c
@@ -471,16 +471,6 @@ static int pcxhr_hwdep_dsp_load(struct snd_hwdep *hw,
         return 0;
 }
 
-static int pcxhr_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
-static int pcxhr_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
 int pcxhr_setup_firmware(struct pcxhr_mgr *mgr)
 {
         int err;
@@ -495,8 +485,6 @@ int pcxhr_setup_firmware(struct pcxhr_mgr *mgr)
 
         hw->iface = SNDRV_HWDEP_IFACE_PCXHR;
         hw->private_data = mgr;
-        hw->ops.open = pcxhr_hwdep_open;
-        hw->ops.release = pcxhr_hwdep_release;
         hw->ops.dsp_status = pcxhr_hwdep_dsp_status;
         hw->ops.dsp_load = pcxhr_hwdep_dsp_load;
         hw->exclusive = 1;
diff --git a/sound/pci/pcxhr/pcxhr_mix22.c b/sound/pci/pcxhr/pcxhr_mix22.c
index ff019126b672..1cb82c0a9cb3 100644
--- a/sound/pci/pcxhr/pcxhr_mix22.c
+++ b/sound/pci/pcxhr/pcxhr_mix22.c
@@ -53,6 +53,8 @@
 #define PCXHR_DSP_RESET_DSP     0x01
 #define PCXHR_DSP_RESET_MUTE    0x02
 #define PCXHR_DSP_RESET_CODEC   0x08
+#define PCXHR_DSP_RESET_GPO_OFFSET      5
+#define PCXHR_DSP_RESET_GPO_MASK        0x60
 
 /* values for PCHR_XLX_CFG register */
 #define PCXHR_CFG_SYNCDSP_MASK          0x80
@@ -81,6 +83,8 @@
 /* values for PCHR_XLX_STATUS register - READ */
 #define PCXHR_STAT_SRC_LOCK             0x01
 #define PCXHR_STAT_LEVEL_IN             0x02
+#define PCXHR_STAT_GPI_OFFSET           2
+#define PCXHR_STAT_GPI_MASK             0x0C
 #define PCXHR_STAT_MIC_CAPS             0x10
 /* values for PCHR_XLX_STATUS register - WRITE */
 #define PCXHR_STAT_FREQ_SYNC_MASK       0x01
@@ -291,10 +295,11 @@ int hr222_sub_init(struct pcxhr_mgr *mgr)
         PCXHR_OUTPB(mgr, PCXHR_DSP_RESET,
                     PCXHR_DSP_RESET_DSP);
         msleep(5);
-        PCXHR_OUTPB(mgr, PCXHR_DSP_RESET,
-                    PCXHR_DSP_RESET_DSP  |
-                    PCXHR_DSP_RESET_MUTE |
-                    PCXHR_DSP_RESET_CODEC);
+        mgr->dsp_reset = PCXHR_DSP_RESET_DSP  |
+                         PCXHR_DSP_RESET_MUTE |
+                         PCXHR_DSP_RESET_CODEC;
+        PCXHR_OUTPB(mgr, PCXHR_DSP_RESET, mgr->dsp_reset);
+        /* hr222_write_gpo(mgr, 0); does the same */
         msleep(5);
 
         /* config AKM */
@@ -496,6 +501,33 @@ int hr222_get_external_clock(struct pcxhr_mgr *mgr,
 }
 
 
+int hr222_read_gpio(struct pcxhr_mgr *mgr, int is_gpi, int *value)
+{
+        if (is_gpi) {
+                unsigned char reg = PCXHR_INPB(mgr, PCXHR_XLX_STATUS);
+                *value = (int)(reg & PCXHR_STAT_GPI_MASK) >>
+                              PCXHR_STAT_GPI_OFFSET;
+        } else {
+                *value = (int)(mgr->dsp_reset & PCXHR_DSP_RESET_GPO_MASK) >>
+                         PCXHR_DSP_RESET_GPO_OFFSET;
+        }
+        return 0;
+}
+
+
+int hr222_write_gpo(struct pcxhr_mgr *mgr, int value)
+{
+        unsigned char reg = mgr->dsp_reset & ~PCXHR_DSP_RESET_GPO_MASK;
+
+        reg |= (unsigned char)(value << PCXHR_DSP_RESET_GPO_OFFSET) &
+               PCXHR_DSP_RESET_GPO_MASK;
+
+        PCXHR_OUTPB(mgr, PCXHR_DSP_RESET, reg);
+        mgr->dsp_reset = reg;
+        return 0;
+}
+
+
 int hr222_update_analog_audio_level(struct snd_pcxhr *chip,
                                     int is_capture, int channel)
 {
diff --git a/sound/pci/pcxhr/pcxhr_mix22.h b/sound/pci/pcxhr/pcxhr_mix22.h
index 6b318b2f0100..5a37a0007e8f 100644
--- a/sound/pci/pcxhr/pcxhr_mix22.h
+++ b/sound/pci/pcxhr/pcxhr_mix22.h
@@ -32,6 +32,9 @@ int hr222_get_external_clock(struct pcxhr_mgr *mgr,
                              enum pcxhr_clock_type clock_type,
                              int *sample_rate);
 
+int hr222_read_gpio(struct pcxhr_mgr *mgr, int is_gpi, int *value);
+int hr222_write_gpo(struct pcxhr_mgr *mgr, int value);
+
 #define HR222_LINE_PLAYBACK_LEVEL_MIN           0       /* -25.5 dB */
 #define HR222_LINE_PLAYBACK_ZERO_LEVEL          51      /* 0.0 dB */
 #define HR222_LINE_PLAYBACK_LEVEL_MAX           99      /* +24.0 dB */
diff --git a/sound/pci/pcxhr/pcxhr_mixer.c b/sound/pci/pcxhr/pcxhr_mixer.c
index 2436e374586f..fec049344621 100644
--- a/sound/pci/pcxhr/pcxhr_mixer.c
+++ b/sound/pci/pcxhr/pcxhr_mixer.c
@@ -789,11 +789,15 @@ static int pcxhr_clock_type_put(struct snd_kcontrol *kcontrol,
         if (mgr->use_clock_type != ucontrol->value.enumerated.item[0]) {
                 mutex_lock(&mgr->setup_mutex);
                 mgr->use_clock_type = ucontrol->value.enumerated.item[0];
-                if (mgr->use_clock_type)
+                rate = 0;
+                if (mgr->use_clock_type != PCXHR_CLOCK_TYPE_INTERNAL) {
                         pcxhr_get_external_clock(mgr, mgr->use_clock_type,
                                                  &rate);
-                else
+                } else {
                         rate = mgr->sample_rate;
+                        if (!rate)
+                                rate = 48000;
+                }
                 if (rate) {
                         pcxhr_set_clock(mgr, rate);
                         if (mgr->sample_rate)
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 3caacfb9d8e0..6f1034417a02 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -2102,9 +2102,9 @@ snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
         if ((err = snd_riptide_create(card, pci, &chip)) < 0) {
                 snd_card_free(card);
                 return err;
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index e7ef3a1a25a8..d7b966e7c4cf 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -1941,9 +1941,10 @@ snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                 return -ENOENT;
         }
 
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct rme32))) == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct rme32), &card);
+        if (err < 0)
+                return err;
         card->private_free = snd_rme32_card_free;
         rme32 = (struct rme32 *) card->private_data;
         rme32->card = card;
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 3fdd488d0975..55fb1c131f58 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -2348,9 +2348,10 @@ snd_rme96_probe(struct pci_dev *pci,
                 dev++;
                 return -ENOENT;
         }
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct rme96))) == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct rme96), &card);
+        if (err < 0)
+                return err;
         card->private_free = snd_rme96_card_free;
         rme96 = (struct rme96 *)card->private_data;     
         rme96->card = card;
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 44d0c15e2b71..314e73531bd1 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -113,7 +113,7 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin");
 
 /* the meters are regular i/o-mapped registers, but offset
    considerably from the rest. the peak registers are reset
-   when read; the least-significant 4 bits are full-scale counters; 
+   when read; the least-significant 4 bits are full-scale counters;
    the actual peak value is in the most-significant 24 bits.
 */
 
@@ -131,7 +131,7 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin");
    26*3 values are read in ss mode
    14*3 in ds mode, with no gap between values
 */
-#define HDSP_9652_peakBase      7164    
+#define HDSP_9652_peakBase      7164
 #define HDSP_9652_rmsBase       4096
 
 /* c.f. the hdsp_9632_meters_t struct */
@@ -173,12 +173,12 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin");
 #define HDSP_SPDIFEmphasis        (1<<10) /* 0=none, 1=on */
 #define HDSP_SPDIFNonAudio        (1<<11) /* 0=off, 1=on */
 #define HDSP_SPDIFOpticalOut      (1<<12) /* 1=use 1st ADAT connector for SPDIF, 0=do not */
-#define HDSP_SyncRef2             (1<<13) 
-#define HDSP_SPDIFInputSelect0    (1<<14) 
-#define HDSP_SPDIFInputSelect1    (1<<15) 
-#define HDSP_SyncRef0             (1<<16) 
+#define HDSP_SyncRef2             (1<<13)
+#define HDSP_SPDIFInputSelect0    (1<<14)
+#define HDSP_SPDIFInputSelect1    (1<<15)
+#define HDSP_SyncRef0             (1<<16)
 #define HDSP_SyncRef1             (1<<17)
-#define HDSP_AnalogExtensionBoard (1<<18) /* For H9632 cards */ 
+#define HDSP_AnalogExtensionBoard (1<<18) /* For H9632 cards */
 #define HDSP_XLRBreakoutCable     (1<<20) /* For H9632 cards */
 #define HDSP_Midi0InterruptEnable (1<<22)
 #define HDSP_Midi1InterruptEnable (1<<23)
@@ -314,7 +314,7 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin");
 #define HDSP_TimecodeSync       (1<<27)
 #define HDSP_AEBO               (1<<28) /* H9632 specific Analog Extension Boards */
 #define HDSP_AEBI               (1<<29) /* 0 = present, 1 = absent */
-#define HDSP_midi0IRQPending    (1<<30) 
+#define HDSP_midi0IRQPending    (1<<30)
 #define HDSP_midi1IRQPending    (1<<31)
 
 #define HDSP_spdifFrequencyMask    (HDSP_spdifFrequency0|HDSP_spdifFrequency1|HDSP_spdifFrequency2)
@@ -391,7 +391,7 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin");
 #define HDSP_CHANNEL_BUFFER_BYTES    (4*HDSP_CHANNEL_BUFFER_SAMPLES)
 
 /* the size of the area we need to allocate for DMA transfers. the
-   size is the same regardless of the number of channels - the 
+   size is the same regardless of the number of channels - the
    Multiface still uses the same memory area.
 
    Note that we allocate 1 more channel than is apparently needed
@@ -460,7 +460,7 @@ struct hdsp {
         unsigned char         qs_in_channels;        /* quad speed mode for H9632 */
         unsigned char         ds_in_channels;
         unsigned char         ss_in_channels;       /* different for multiface/digiface */
-        unsigned char         qs_out_channels;      
+        unsigned char         qs_out_channels;
         unsigned char         ds_out_channels;
         unsigned char         ss_out_channels;
 
@@ -502,9 +502,9 @@ static char channel_map_df_ss[HDSP_MAX_CHANNELS] = {
 
 static char channel_map_mf_ss[HDSP_MAX_CHANNELS] = { /* Multiface */
         /* Analog */
-        0, 1, 2, 3, 4, 5, 6, 7, 
+        0, 1, 2, 3, 4, 5, 6, 7,
         /* ADAT 2 */
-        16, 17, 18, 19, 20, 21, 22, 23, 
+        16, 17, 18, 19, 20, 21, 22, 23,
         /* SPDIF */
         24, 25,
         -1, -1, -1, -1, -1, -1, -1, -1
@@ -525,11 +525,11 @@ static char channel_map_H9632_ss[HDSP_MAX_CHANNELS] = {
         /* SPDIF */
         8, 9,
         /* Analog */
-        10, 11, 
+        10, 11,
         /* AO4S-192 and AI4S-192 extension boards */
         12, 13, 14, 15,
         /* others don't exist */
-        -1, -1, -1, -1, -1, -1, -1, -1, 
+        -1, -1, -1, -1, -1, -1, -1, -1,
         -1, -1
 };
 
@@ -539,7 +539,7 @@ static char channel_map_H9632_ds[HDSP_MAX_CHANNELS] = {
         /* SPDIF */
         8, 9,
         /* Analog */
-        10, 11, 
+        10, 11,
         /* AO4S-192 and AI4S-192 extension boards */
         12, 13, 14, 15,
         /* others don't exist */
@@ -587,7 +587,7 @@ static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_d
 static struct pci_device_id snd_hdsp_ids[] = {
         {
                 .vendor = PCI_VENDOR_ID_XILINX,
-                .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP, 
+                .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
         }, /* RME Hammerfall-DSP */
@@ -653,7 +653,6 @@ static unsigned int hdsp_read(struct hdsp *hdsp, int reg)
 
 static int hdsp_check_for_iobox (struct hdsp *hdsp)
 {
-
         if (hdsp->io_type == H9652 || hdsp->io_type == H9632) return 0;
         if (hdsp_read (hdsp, HDSP_statusRegister) & HDSP_ConfigError) {
                 snd_printk ("Hammerfall-DSP: no Digiface or Multiface connected!\n");
@@ -661,7 +660,29 @@ static int hdsp_check_for_iobox (struct hdsp *hdsp)
                 return -EIO;
         }
         return 0;
+}
 
+static int hdsp_wait_for_iobox(struct hdsp *hdsp, unsigned int loops,
+                               unsigned int delay)
+{
+        unsigned int i;
+
+        if (hdsp->io_type == H9652 || hdsp->io_type == H9632)
+                return 0;
+
+        for (i = 0; i != loops; ++i) {
+                if (hdsp_read(hdsp, HDSP_statusRegister) & HDSP_ConfigError)
+                        msleep(delay);
+                else {
+                        snd_printd("Hammerfall-DSP: iobox found after %ums!\n",
+                                   i * delay);
+                        return 0;
+                }
+        }
+
+        snd_printk("Hammerfall-DSP: no Digiface or Multiface connected!\n");
+        hdsp->state &= ~HDSP_FirmwareLoaded;
+        return -EIO;
 }
 
 static int snd_hdsp_load_firmware_from_cache(struct hdsp *hdsp) {
@@ -670,19 +691,19 @@ static int snd_hdsp_load_firmware_from_cache(struct hdsp *hdsp) {
         unsigned long flags;
 
         if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) {
-                
+
                 snd_printk ("Hammerfall-DSP: loading firmware\n");
 
                 hdsp_write (hdsp, HDSP_control2Reg, HDSP_S_PROGRAM);
                 hdsp_write (hdsp, HDSP_fifoData, 0);
-                
+
                 if (hdsp_fifo_wait (hdsp, 0, HDSP_LONG_WAIT)) {
                         snd_printk ("Hammerfall-DSP: timeout waiting for download preparation\n");
                         return -EIO;
                 }
-                
+
                 hdsp_write (hdsp, HDSP_control2Reg, HDSP_S_LOAD);
-                
+
                 for (i = 0; i < 24413; ++i) {
                         hdsp_write(hdsp, HDSP_fifoData, hdsp->firmware_cache[i]);
                         if (hdsp_fifo_wait (hdsp, 127, HDSP_LONG_WAIT)) {
@@ -692,7 +713,7 @@ static int snd_hdsp_load_firmware_from_cache(struct hdsp *hdsp) {
                 }
 
                 ssleep(3);
-                
+
                 if (hdsp_fifo_wait (hdsp, 0, HDSP_LONG_WAIT)) {
                         snd_printk ("Hammerfall-DSP: timeout at end of firmware loading\n");
                         return -EIO;
@@ -705,15 +726,15 @@ static int snd_hdsp_load_firmware_from_cache(struct hdsp *hdsp) {
 #endif
                 hdsp_write (hdsp, HDSP_control2Reg, hdsp->control2_register);
                 snd_printk ("Hammerfall-DSP: finished firmware loading\n");
-                
+
         }
         if (hdsp->state & HDSP_InitializationComplete) {
                 snd_printk(KERN_INFO "Hammerfall-DSP: firmware loaded from cache, restoring defaults\n");
                 spin_lock_irqsave(&hdsp->lock, flags);
                 snd_hdsp_set_defaults(hdsp);
-                spin_unlock_irqrestore(&hdsp->lock, flags); 
+                spin_unlock_irqrestore(&hdsp->lock, flags);
         }
-        
+
         hdsp->state |= HDSP_FirmwareLoaded;
 
         return 0;
@@ -722,7 +743,7 @@ static int snd_hdsp_load_firmware_from_cache(struct hdsp *hdsp) {
 static int hdsp_get_iobox_version (struct hdsp *hdsp)
 {
         if ((hdsp_read (hdsp, HDSP_statusRegister) & HDSP_DllError) != 0) {
-        
+
                 hdsp_write (hdsp, HDSP_control2Reg, HDSP_PROGRAM);
                 hdsp_write (hdsp, HDSP_fifoData, 0);
                 if (hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT) < 0)
@@ -738,7 +759,7 @@ static int hdsp_get_iobox_version (struct hdsp *hdsp)
                         hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT);
                 } else {
                         hdsp->io_type = Digiface;
-                } 
+                }
         } else {
                 /* firmware was already loaded, get iobox type */
                 if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version1)
@@ -786,13 +807,13 @@ static int hdsp_check_for_firmware (struct hdsp *hdsp, int load_on_demand)
 
 
 static int hdsp_fifo_wait(struct hdsp *hdsp, int count, int timeout)
-{    
+{
         int i;
 
         /* the fifoStatus registers reports on how many words
            are available in the command FIFO.
         */
-        
+
         for (i = 0; i < timeout; i++) {
 
                 if ((int)(hdsp_read (hdsp, HDSP_fifoStatus) & 0xff) <= count)
@@ -824,11 +845,11 @@ static int hdsp_write_gain(struct hdsp *hdsp, unsigned int addr, unsigned short
 
         if (addr >= HDSP_MATRIX_MIXER_SIZE)
                 return -1;
-        
+
         if (hdsp->io_type == H9652 || hdsp->io_type == H9632) {
 
                 /* from martin bjornsen:
-                   
+
                    "You can only write dwords to the
                    mixer memory which contain two
                    mixer values in the low and high
@@ -847,7 +868,7 @@ static int hdsp_write_gain(struct hdsp *hdsp, unsigned int addr, unsigned short
 
                 hdsp->mixer_matrix[addr] = data;
 
-                
+
                 /* `addr' addresses a 16-bit wide address, but
                    the address space accessed via hdsp_write
                    uses byte offsets. put another way, addr
@@ -856,17 +877,17 @@ static int hdsp_write_gain(struct hdsp *hdsp, unsigned int addr, unsigned short
                    to access 0 to 2703 ...
                 */
                 ad = addr/2;
-        
-                hdsp_write (hdsp, 4096 + (ad*4), 
-                            (hdsp->mixer_matrix[(addr&0x7fe)+1] << 16) + 
+
+                hdsp_write (hdsp, 4096 + (ad*4),
+                            (hdsp->mixer_matrix[(addr&0x7fe)+1] << 16) +
                             hdsp->mixer_matrix[addr&0x7fe]);
-                
+
                 return 0;
 
         } else {
 
                 ad = (addr << 16) + data;
-                
+
                 if (hdsp_fifo_wait(hdsp, 127, HDSP_LONG_WAIT))
                         return -1;
 
@@ -902,7 +923,7 @@ static int hdsp_spdif_sample_rate(struct hdsp *hdsp)
 
         if (status & HDSP_SPDIFErrorFlag)
                 return 0;
-        
+
         switch (rate_bits) {
         case HDSP_spdifFrequency32KHz: return 32000;
         case HDSP_spdifFrequency44_1KHz: return 44100;
@@ -910,13 +931,13 @@ static int hdsp_spdif_sample_rate(struct hdsp *hdsp)
         case HDSP_spdifFrequency64KHz: return 64000;
         case HDSP_spdifFrequency88_2KHz: return 88200;
         case HDSP_spdifFrequency96KHz: return 96000;
-        case HDSP_spdifFrequency128KHz: 
+        case HDSP_spdifFrequency128KHz:
                 if (hdsp->io_type == H9632) return 128000;
                 break;
-        case HDSP_spdifFrequency176_4KHz: 
+        case HDSP_spdifFrequency176_4KHz:
                 if (hdsp->io_type == H9632) return 176400;
                 break;
-        case HDSP_spdifFrequency192KHz: 
+        case HDSP_spdifFrequency192KHz:
                 if (hdsp->io_type == H9632) return 192000;
                 break;
         default:
@@ -1027,7 +1048,7 @@ static void hdsp_set_dds_value(struct hdsp *hdsp, int rate)
 {
         u64 n;
         u32 r;
-        
+
         if (rate >= 112000)
                 rate /= 4;
         else if (rate >= 56000)
@@ -1053,35 +1074,35 @@ static int hdsp_set_rate(struct hdsp *hdsp, int rate, int called_internally)
            there is no need for it (e.g. during module
            initialization).
         */
-        
-        if (!(hdsp->control_register & HDSP_ClockModeMaster)) { 
+
+        if (!(hdsp->control_register & HDSP_ClockModeMaster)) {
                 if (called_internally) {
                         /* request from ctl or card initialization */
                         snd_printk(KERN_ERR "Hammerfall-DSP: device is not running as a clock master: cannot set sample rate.\n");
                         return -1;
-                } else {                
+                } else {
                         /* hw_param request while in AutoSync mode */
                         int external_freq = hdsp_external_sample_rate(hdsp);
                         int spdif_freq = hdsp_spdif_sample_rate(hdsp);
-                
+
                         if ((spdif_freq == external_freq*2) && (hdsp_autosync_ref(hdsp) >= HDSP_AUTOSYNC_FROM_ADAT1))
                                 snd_printk(KERN_INFO "Hammerfall-DSP: Detected ADAT in double speed mode\n");
                         else if (hdsp->io_type == H9632 && (spdif_freq == external_freq*4) && (hdsp_autosync_ref(hdsp) >= HDSP_AUTOSYNC_FROM_ADAT1))
-                                snd_printk(KERN_INFO "Hammerfall-DSP: Detected ADAT in quad speed mode\n");                     
+                                snd_printk(KERN_INFO "Hammerfall-DSP: Detected ADAT in quad speed mode\n");
                         else if (rate != external_freq) {
                                 snd_printk(KERN_INFO "Hammerfall-DSP: No AutoSync source for requested rate\n");
                                 return -1;
-                        }               
-                }       
+                        }
+                }
         }
 
         current_rate = hdsp->system_sample_rate;
 
         /* Changing from a "single speed" to a "double speed" rate is
            not allowed if any substreams are open. This is because
-           such a change causes a shift in the location of 
+           such a change causes a shift in the location of
            the DMA buffers and a reduction in the number of available
-           buffers. 
+           buffers.
 
            Note that a similar but essentially insoluble problem
            exists for externally-driven rate changes. All we can do
@@ -1089,7 +1110,7 @@ static int hdsp_set_rate(struct hdsp *hdsp, int rate, int called_internally)
 
         if (rate > 96000 && hdsp->io_type != H9632)
                 return -EINVAL;
-        
+
         switch (rate) {
         case 32000:
                 if (current_rate > 48000)
@@ -1179,7 +1200,7 @@ static int hdsp_set_rate(struct hdsp *hdsp, int rate, int called_internally)
                         break;
                 }
         }
-        
+
         hdsp->system_sample_rate = rate;
 
         return 0;
@@ -1245,16 +1266,16 @@ static int snd_hdsp_midi_output_write (struct hdsp_midi *hmidi)
         unsigned char buf[128];
 
         /* Output is not interrupt driven */
-                
+
         spin_lock_irqsave (&hmidi->lock, flags);
         if (hmidi->output) {
                 if (!snd_rawmidi_transmit_empty (hmidi->output)) {
                         if ((n_pending = snd_hdsp_midi_output_possible (hmidi->hdsp, hmidi->id)) > 0) {
                                 if (n_pending > (int)sizeof (buf))
                                         n_pending = sizeof (buf);
-                                
+
                                 if ((to_write = snd_rawmidi_transmit (hmidi->output, buf, n_pending)) > 0) {
-                                        for (i = 0; i < to_write; ++i) 
+                                        for (i = 0; i < to_write; ++i)
                                                 snd_hdsp_midi_write_byte (hmidi->hdsp, hmidi->id, buf[i]);
                                 }
                         }
@@ -1325,14 +1346,14 @@ static void snd_hdsp_midi_output_timer(unsigned long data)
 {
         struct hdsp_midi *hmidi = (struct hdsp_midi *) data;
         unsigned long flags;
-        
+
         snd_hdsp_midi_output_write(hmidi);
         spin_lock_irqsave (&hmidi->lock, flags);
 
         /* this does not bump hmidi->istimer, because the
            kernel automatically removed the timer when it
            expired, and we are now adding it back, thus
-           leaving istimer wherever it was set before.  
+           leaving istimer wherever it was set before.
         */
 
         if (hmidi->istimer) {
@@ -1501,7 +1522,7 @@ static int snd_hdsp_control_spdif_info(struct snd_kcontrol *kcontrol, struct snd
 static int snd_hdsp_control_spdif_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         snd_hdsp_convert_to_aes(&ucontrol->value.iec958, hdsp->creg_spdif);
         return 0;
 }
@@ -1511,7 +1532,7 @@ static int snd_hdsp_control_spdif_put(struct snd_kcontrol *kcontrol, struct snd_
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         u32 val;
-        
+
         val = snd_hdsp_convert_from_aes(&ucontrol->value.iec958);
         spin_lock_irq(&hdsp->lock);
         change = val != hdsp->creg_spdif;
@@ -1530,7 +1551,7 @@ static int snd_hdsp_control_spdif_stream_info(struct snd_kcontrol *kcontrol, str
 static int snd_hdsp_control_spdif_stream_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         snd_hdsp_convert_to_aes(&ucontrol->value.iec958, hdsp->creg_spdif_stream);
         return 0;
 }
@@ -1540,7 +1561,7 @@ static int snd_hdsp_control_spdif_stream_put(struct snd_kcontrol *kcontrol, stru
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         u32 val;
-        
+
         val = snd_hdsp_convert_from_aes(&ucontrol->value.iec958);
         spin_lock_irq(&hdsp->lock);
         change = val != hdsp->creg_spdif_stream;
@@ -1602,7 +1623,7 @@ static int snd_hdsp_info_spdif_in(struct snd_kcontrol *kcontrol, struct snd_ctl_
 static int snd_hdsp_get_spdif_in(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_spdif_in(hdsp);
         return 0;
 }
@@ -1612,7 +1633,7 @@ static int snd_hdsp_put_spdif_in(struct snd_kcontrol *kcontrol, struct snd_ctl_e
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         unsigned int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.enumerated.item[0] % ((hdsp->io_type == H9632) ? 4 : 3);
@@ -1649,7 +1670,7 @@ static int hdsp_set_spdif_output(struct hdsp *hdsp, int out)
 static int snd_hdsp_get_spdif_out(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.integer.value[0] = hdsp_spdif_out(hdsp);
         return 0;
 }
@@ -1659,7 +1680,7 @@ static int snd_hdsp_put_spdif_out(struct snd_kcontrol *kcontrol, struct snd_ctl_
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         unsigned int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.integer.value[0] & 1;
@@ -1693,7 +1714,7 @@ static int hdsp_set_spdif_professional(struct hdsp *hdsp, int val)
 static int snd_hdsp_get_spdif_professional(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.integer.value[0] = hdsp_spdif_professional(hdsp);
         return 0;
 }
@@ -1703,7 +1724,7 @@ static int snd_hdsp_put_spdif_professional(struct snd_kcontrol *kcontrol, struct
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         unsigned int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.integer.value[0] & 1;
@@ -1737,7 +1758,7 @@ static int hdsp_set_spdif_emphasis(struct hdsp *hdsp, int val)
 static int snd_hdsp_get_spdif_emphasis(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.integer.value[0] = hdsp_spdif_emphasis(hdsp);
         return 0;
 }
@@ -1747,7 +1768,7 @@ static int snd_hdsp_put_spdif_emphasis(struct snd_kcontrol *kcontrol, struct snd
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         unsigned int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.integer.value[0] & 1;
@@ -1781,7 +1802,7 @@ static int hdsp_set_spdif_nonaudio(struct hdsp *hdsp, int val)
 static int snd_hdsp_get_spdif_nonaudio(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.integer.value[0] = hdsp_spdif_nonaudio(hdsp);
         return 0;
 }
@@ -1791,7 +1812,7 @@ static int snd_hdsp_put_spdif_nonaudio(struct snd_kcontrol *kcontrol, struct snd
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         unsigned int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.integer.value[0] & 1;
@@ -1828,7 +1849,7 @@ static int snd_hdsp_info_spdif_sample_rate(struct snd_kcontrol *kcontrol, struct
 static int snd_hdsp_get_spdif_sample_rate(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         switch (hdsp_spdif_sample_rate(hdsp)) {
         case 32000:
                 ucontrol->value.enumerated.item[0] = 0;
@@ -1858,7 +1879,7 @@ static int snd_hdsp_get_spdif_sample_rate(struct snd_kcontrol *kcontrol, struct
                 ucontrol->value.enumerated.item[0] = 9;
                 break;
         default:
-                ucontrol->value.enumerated.item[0] = 6;         
+                ucontrol->value.enumerated.item[0] = 6;
         }
         return 0;
 }
@@ -1882,7 +1903,7 @@ static int snd_hdsp_info_system_sample_rate(struct snd_kcontrol *kcontrol, struc
 static int snd_hdsp_get_system_sample_rate(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp->system_sample_rate;
         return 0;
 }
@@ -1899,7 +1920,7 @@ static int snd_hdsp_get_system_sample_rate(struct snd_kcontrol *kcontrol, struct
 static int snd_hdsp_info_autosync_sample_rate(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        static char *texts[] = {"32000", "44100", "48000", "64000", "88200", "96000", "None", "128000", "176400", "192000"};    
+        static char *texts[] = {"32000", "44100", "48000", "64000", "88200", "96000", "None", "128000", "176400", "192000"};
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = (hdsp->io_type == H9632) ? 10 : 7 ;
@@ -1912,7 +1933,7 @@ static int snd_hdsp_info_autosync_sample_rate(struct snd_kcontrol *kcontrol, str
 static int snd_hdsp_get_autosync_sample_rate(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         switch (hdsp_external_sample_rate(hdsp)) {
         case 32000:
                 ucontrol->value.enumerated.item[0] = 0;
@@ -1940,9 +1961,9 @@ static int snd_hdsp_get_autosync_sample_rate(struct snd_kcontrol *kcontrol, stru
                 break;
         case 192000:
                 ucontrol->value.enumerated.item[0] = 9;
-                break;  
+                break;
         default:
-                ucontrol->value.enumerated.item[0] = 6;         
+                ucontrol->value.enumerated.item[0] = 6;
         }
         return 0;
 }
@@ -1968,7 +1989,7 @@ static int hdsp_system_clock_mode(struct hdsp *hdsp)
 static int snd_hdsp_info_system_clock_mode(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = {"Master", "Slave" };
-        
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = 2;
@@ -1981,7 +2002,7 @@ static int snd_hdsp_info_system_clock_mode(struct snd_kcontrol *kcontrol, struct
 static int snd_hdsp_get_system_clock_mode(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_system_clock_mode(hdsp);
         return 0;
 }
@@ -2018,7 +2039,7 @@ static int hdsp_clock_source(struct hdsp *hdsp)
                 case 192000:
                         return 9;
                 default:
-                        return 3;       
+                        return 3;
                 }
         } else {
                 return 0;
@@ -2032,7 +2053,7 @@ static int hdsp_set_clock_source(struct hdsp *hdsp, int mode)
         case HDSP_CLOCK_SOURCE_AUTOSYNC:
                 if (hdsp_external_sample_rate(hdsp) != 0) {
                     if (!hdsp_set_rate(hdsp, hdsp_external_sample_rate(hdsp), 1)) {
-                        hdsp->control_register &= ~HDSP_ClockModeMaster;                
+                        hdsp->control_register &= ~HDSP_ClockModeMaster;
                         hdsp_write(hdsp, HDSP_controlRegister, hdsp->control_register);
                         return 0;
                     }
@@ -2043,7 +2064,7 @@ static int hdsp_set_clock_source(struct hdsp *hdsp, int mode)
                 break;
         case HDSP_CLOCK_SOURCE_INTERNAL_44_1KHZ:
                 rate = 44100;
-                break;      
+                break;
         case HDSP_CLOCK_SOURCE_INTERNAL_48KHZ:
                 rate = 48000;
                 break;
@@ -2078,13 +2099,13 @@ static int snd_hdsp_info_clock_source(struct snd_kcontrol *kcontrol, struct snd_
 {
         static char *texts[] = {"AutoSync", "Internal 32.0 kHz", "Internal 44.1 kHz", "Internal 48.0 kHz", "Internal 64.0 kHz", "Internal 88.2 kHz", "Internal 96.0 kHz", "Internal 128 kHz", "Internal 176.4 kHz", "Internal 192.0 KHz" };
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         if (hdsp->io_type == H9632)
             uinfo->value.enumerated.items = 10;
         else
-            uinfo->value.enumerated.items = 7;  
+            uinfo->value.enumerated.items = 7;
         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]);
@@ -2094,7 +2115,7 @@ static int snd_hdsp_info_clock_source(struct snd_kcontrol *kcontrol, struct snd_
 static int snd_hdsp_get_clock_source(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_clock_source(hdsp);
         return 0;
 }
@@ -2104,7 +2125,7 @@ static int snd_hdsp_put_clock_source(struct snd_kcontrol *kcontrol, struct snd_c
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.enumerated.item[0];
@@ -2130,7 +2151,7 @@ static int snd_hdsp_put_clock_source(struct snd_kcontrol *kcontrol, struct snd_c
 static int snd_hdsp_get_clock_source_lock(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.integer.value[0] = hdsp->clock_source_locked;
         return 0;
 }
@@ -2165,7 +2186,7 @@ static int hdsp_da_gain(struct hdsp *hdsp)
         case HDSP_DAGainMinus10dBV:
                 return 2;
         default:
-                return 1;       
+                return 1;
         }
 }
 
@@ -2180,8 +2201,8 @@ static int hdsp_set_da_gain(struct hdsp *hdsp, int mode)
                 hdsp->control_register |= HDSP_DAGainPlus4dBu;
                 break;
         case 2:
-                hdsp->control_register |= HDSP_DAGainMinus10dBV;                
-                break;      
+                hdsp->control_register |= HDSP_DAGainMinus10dBV;
+                break;
         default:
                 return -1;
 
@@ -2193,7 +2214,7 @@ static int hdsp_set_da_gain(struct hdsp *hdsp, int mode)
 static int snd_hdsp_info_da_gain(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = {"Hi Gain", "+4 dBu", "-10 dbV"};
-        
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = 3;
@@ -2206,7 +2227,7 @@ static int snd_hdsp_info_da_gain(struct snd_kcontrol *kcontrol, struct snd_ctl_e
 static int snd_hdsp_get_da_gain(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_da_gain(hdsp);
         return 0;
 }
@@ -2216,7 +2237,7 @@ static int snd_hdsp_put_da_gain(struct snd_kcontrol *kcontrol, struct snd_ctl_el
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.enumerated.item[0];
@@ -2250,7 +2271,7 @@ static int hdsp_ad_gain(struct hdsp *hdsp)
         case HDSP_ADGainLowGain:
                 return 2;
         default:
-                return 1;       
+                return 1;
         }
 }
 
@@ -2262,11 +2283,11 @@ static int hdsp_set_ad_gain(struct hdsp *hdsp, int mode)
                 hdsp->control_register |= HDSP_ADGainMinus10dBV;
                 break;
         case 1:
-                hdsp->control_register |= HDSP_ADGainPlus4dBu;          
+                hdsp->control_register |= HDSP_ADGainPlus4dBu;
                 break;
         case 2:
-                hdsp->control_register |= HDSP_ADGainLowGain;           
-                break;      
+                hdsp->control_register |= HDSP_ADGainLowGain;
+                break;
         default:
                 return -1;
 
@@ -2278,7 +2299,7 @@ static int hdsp_set_ad_gain(struct hdsp *hdsp, int mode)
 static int snd_hdsp_info_ad_gain(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = {"-10 dBV", "+4 dBu", "Lo Gain"};
-        
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = 3;
@@ -2291,7 +2312,7 @@ static int snd_hdsp_info_ad_gain(struct snd_kcontrol *kcontrol, struct snd_ctl_e
 static int snd_hdsp_get_ad_gain(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_ad_gain(hdsp);
         return 0;
 }
@@ -2301,7 +2322,7 @@ static int snd_hdsp_put_ad_gain(struct snd_kcontrol *kcontrol, struct snd_ctl_el
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.enumerated.item[0];
@@ -2335,7 +2356,7 @@ static int hdsp_phone_gain(struct hdsp *hdsp)
         case HDSP_PhoneGainMinus12dB:
                 return 2;
         default:
-                return 0;       
+                return 0;
         }
 }
 
@@ -2347,11 +2368,11 @@ static int hdsp_set_phone_gain(struct hdsp *hdsp, int mode)
                 hdsp->control_register |= HDSP_PhoneGain0dB;
                 break;
         case 1:
-                hdsp->control_register |= HDSP_PhoneGainMinus6dB;               
+                hdsp->control_register |= HDSP_PhoneGainMinus6dB;
                 break;
         case 2:
-                hdsp->control_register |= HDSP_PhoneGainMinus12dB;              
-                break;      
+                hdsp->control_register |= HDSP_PhoneGainMinus12dB;
+                break;
         default:
                 return -1;
 
@@ -2363,7 +2384,7 @@ static int hdsp_set_phone_gain(struct hdsp *hdsp, int mode)
 static int snd_hdsp_info_phone_gain(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = {"0 dB", "-6 dB", "-12 dB"};
-        
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = 3;
@@ -2376,7 +2397,7 @@ static int snd_hdsp_info_phone_gain(struct snd_kcontrol *kcontrol, struct snd_ct
 static int snd_hdsp_get_phone_gain(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_phone_gain(hdsp);
         return 0;
 }
@@ -2386,7 +2407,7 @@ static int snd_hdsp_put_phone_gain(struct snd_kcontrol *kcontrol, struct snd_ctl
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.enumerated.item[0];
@@ -2432,7 +2453,7 @@ static int hdsp_set_xlr_breakout_cable(struct hdsp *hdsp, int mode)
 static int snd_hdsp_get_xlr_breakout_cable(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_xlr_breakout_cable(hdsp);
         return 0;
 }
@@ -2442,7 +2463,7 @@ static int snd_hdsp_put_xlr_breakout_cable(struct snd_kcontrol *kcontrol, struct
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.integer.value[0] & 1;
@@ -2488,7 +2509,7 @@ static int hdsp_set_aeb(struct hdsp *hdsp, int mode)
 static int snd_hdsp_get_aeb(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_aeb(hdsp);
         return 0;
 }
@@ -2498,7 +2519,7 @@ static int snd_hdsp_put_aeb(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.integer.value[0] & 1;
@@ -2576,7 +2597,7 @@ static int snd_hdsp_info_pref_sync_ref(struct snd_kcontrol *kcontrol, struct snd
 {
         static char *texts[] = {"Word", "IEC958", "ADAT1", "ADAT Sync", "ADAT2", "ADAT3" };
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
 
@@ -2595,7 +2616,7 @@ static int snd_hdsp_info_pref_sync_ref(struct snd_kcontrol *kcontrol, struct snd
                 uinfo->value.enumerated.items = 0;
                 break;
         }
-                
+
         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]);
@@ -2605,7 +2626,7 @@ static int snd_hdsp_info_pref_sync_ref(struct snd_kcontrol *kcontrol, struct snd
 static int snd_hdsp_get_pref_sync_ref(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_pref_sync_ref(hdsp);
         return 0;
 }
@@ -2615,7 +2636,7 @@ static int snd_hdsp_put_pref_sync_ref(struct snd_kcontrol *kcontrol, struct snd_
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change, max;
         unsigned int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
 
@@ -2664,7 +2685,7 @@ static int hdsp_autosync_ref(struct hdsp *hdsp)
         case HDSP_SelSyncRef_SPDIF:
                 return HDSP_AUTOSYNC_FROM_SPDIF;
         case HDSP_SelSyncRefMask:
-                return HDSP_AUTOSYNC_FROM_NONE; 
+                return HDSP_AUTOSYNC_FROM_NONE;
         case HDSP_SelSyncRef_ADAT1:
                 return HDSP_AUTOSYNC_FROM_ADAT1;
         case HDSP_SelSyncRef_ADAT2:
@@ -2680,7 +2701,7 @@ static int hdsp_autosync_ref(struct hdsp *hdsp)
 static int snd_hdsp_info_autosync_ref(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = {"Word", "ADAT Sync", "IEC958", "None", "ADAT1", "ADAT2", "ADAT3" };
-        
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = 7;
@@ -2693,7 +2714,7 @@ static int snd_hdsp_info_autosync_ref(struct snd_kcontrol *kcontrol, struct snd_
 static int snd_hdsp_get_autosync_ref(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_autosync_ref(hdsp);
         return 0;
 }
@@ -2727,7 +2748,7 @@ static int hdsp_set_line_output(struct hdsp *hdsp, int out)
 static int snd_hdsp_get_line_out(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         spin_lock_irq(&hdsp->lock);
         ucontrol->value.integer.value[0] = hdsp_line_out(hdsp);
         spin_unlock_irq(&hdsp->lock);
@@ -2739,7 +2760,7 @@ static int snd_hdsp_put_line_out(struct snd_kcontrol *kcontrol, struct snd_ctl_e
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         unsigned int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.integer.value[0] & 1;
@@ -2773,7 +2794,7 @@ static int hdsp_set_precise_pointer(struct hdsp *hdsp, int precise)
 static int snd_hdsp_get_precise_pointer(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         spin_lock_irq(&hdsp->lock);
         ucontrol->value.integer.value[0] = hdsp->precise_ptr;
         spin_unlock_irq(&hdsp->lock);
@@ -2785,7 +2806,7 @@ static int snd_hdsp_put_precise_pointer(struct snd_kcontrol *kcontrol, struct sn
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         unsigned int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.integer.value[0] & 1;
@@ -2819,7 +2840,7 @@ static int hdsp_set_use_midi_tasklet(struct hdsp *hdsp, int use_tasklet)
 static int snd_hdsp_get_use_midi_tasklet(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         spin_lock_irq(&hdsp->lock);
         ucontrol->value.integer.value[0] = hdsp->use_midi_tasklet;
         spin_unlock_irq(&hdsp->lock);
@@ -2831,7 +2852,7 @@ static int snd_hdsp_put_use_midi_tasklet(struct snd_kcontrol *kcontrol, struct s
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         unsigned int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.integer.value[0] & 1;
@@ -2873,12 +2894,12 @@ static int snd_hdsp_get_mixer(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
 
         source = ucontrol->value.integer.value[0];
         destination = ucontrol->value.integer.value[1];
-        
+
         if (source >= hdsp->max_channels)
                 addr = hdsp_playback_to_output_key(hdsp,source-hdsp->max_channels,destination);
         else
                 addr = hdsp_input_to_output_key(hdsp,source, destination);
-        
+
         spin_lock_irq(&hdsp->lock);
         ucontrol->value.integer.value[2] = hdsp_read_gain (hdsp, addr);
         spin_unlock_irq(&hdsp->lock);
@@ -2926,7 +2947,7 @@ static int snd_hdsp_put_mixer(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
 
 static int snd_hdsp_info_sync_check(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = {"No Lock", "Lock", "Sync" };    
+        static char *texts[] = {"No Lock", "Lock", "Sync" };
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = 3;
@@ -2971,7 +2992,7 @@ static int hdsp_spdif_sync_check(struct hdsp *hdsp)
         int status = hdsp_read(hdsp, HDSP_statusRegister);
         if (status & HDSP_SPDIFErrorFlag)
                 return 0;
-        else {  
+        else {
                 if (status & HDSP_SPDIFSync)
                         return 2;
                 else
@@ -3007,7 +3028,7 @@ static int hdsp_adatsync_sync_check(struct hdsp *hdsp)
                         return 1;
         } else
                 return 0;
-}       
+}
 
 static int snd_hdsp_get_adatsync_sync_check(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -3025,17 +3046,17 @@ static int snd_hdsp_get_adatsync_sync_check(struct snd_kcontrol *kcontrol, struc
 }
 
 static int hdsp_adat_sync_check(struct hdsp *hdsp, int idx)
-{       
+{
         int status = hdsp_read(hdsp, HDSP_statusRegister);
-        
+
         if (status & (HDSP_Lock0>>idx)) {
                 if (status & (HDSP_Sync0>>idx))
                         return 2;
                 else
-                        return 1;               
+                        return 1;
         } else
                 return 0;
-} 
+}
 
 static int snd_hdsp_get_adat_sync_check(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -3053,7 +3074,7 @@ static int snd_hdsp_get_adat_sync_check(struct snd_kcontrol *kcontrol, struct sn
                 break;
         case Multiface:
         case H9632:
-                if (offset >= 1) 
+                if (offset >= 1)
                         return -EINVAL;
                 break;
         default:
@@ -3115,7 +3136,7 @@ static int snd_hdsp_info_dds_offset(struct snd_kcontrol *kcontrol, struct snd_ct
 static int snd_hdsp_get_dds_offset(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
-        
+
         ucontrol->value.enumerated.item[0] = hdsp_dds_offset(hdsp);
         return 0;
 }
@@ -3125,7 +3146,7 @@ static int snd_hdsp_put_dds_offset(struct snd_kcontrol *kcontrol, struct snd_ctl
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
         int change;
         int val;
-        
+
         if (!snd_hdsp_use_is_exclusive(hdsp))
                 return -EBUSY;
         val = ucontrol->value.enumerated.item[0];
@@ -3170,7 +3191,7 @@ static struct snd_kcontrol_new snd_hdsp_controls[] = {
         .get =          snd_hdsp_control_spdif_mask_get,
         .private_value = IEC958_AES0_NONAUDIO |
                          IEC958_AES0_PROFESSIONAL |
-                         IEC958_AES0_CON_EMPHASIS,                                                                                            
+                         IEC958_AES0_CON_EMPHASIS,
 },
 {
         .access =       SNDRV_CTL_ELEM_ACCESS_READ,
@@ -3188,7 +3209,7 @@ HDSP_SPDIF_OUT("IEC958 Output also on ADAT1", 0),
 HDSP_SPDIF_PROFESSIONAL("IEC958 Professional Bit", 0),
 HDSP_SPDIF_EMPHASIS("IEC958 Emphasis Bit", 0),
 HDSP_SPDIF_NON_AUDIO("IEC958 Non-audio Bit", 0),
-/* 'Sample Clock Source' complies with the alsa control naming scheme */ 
+/* 'Sample Clock Source' complies with the alsa control naming scheme */
 HDSP_CLOCK_SOURCE("Sample Clock Source", 0),
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -3240,7 +3261,7 @@ static int snd_hdsp_create_controls(struct snd_card *card, struct hdsp *hdsp)
                                 return err;
                 }
         }
-        
+
         /* DA, AD and Phone gain and XLR breakout cable controls for H9632 cards */
         if (hdsp->io_type == H9632) {
                 for (idx = 0; idx < ARRAY_SIZE(snd_hdsp_9632_controls); idx++) {
@@ -3259,7 +3280,7 @@ static int snd_hdsp_create_controls(struct snd_card *card, struct hdsp *hdsp)
 }
 
 /*------------------------------------------------------------
-   /proc interface 
+   /proc interface
  ------------------------------------------------------------*/
 
 static void
@@ -3298,7 +3319,7 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                         }
                 }
         }
-        
+
         status = hdsp_read(hdsp, HDSP_statusRegister);
         status2 = hdsp_read(hdsp, HDSP_status2Register);
 
@@ -3362,17 +3383,17 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                 break;
                 case HDSP_CLOCK_SOURCE_INTERNAL_192KHZ:
                 clock_source = "Internal 192 kHz";
-                break;  
+                break;
         default:
-                clock_source = "Error";         
+                clock_source = "Error";
         }
         snd_iprintf (buffer, "Sample Clock Source: %s\n", clock_source);
-                        
+
         if (hdsp_system_clock_mode(hdsp))
                 system_clock_mode = "Slave";
         else
                 system_clock_mode = "Master";
-        
+
         switch (hdsp_pref_sync_ref (hdsp)) {
         case HDSP_SYNC_FROM_WORD:
                 pref_sync_ref = "Word Clock";
@@ -3397,7 +3418,7 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                 break;
         }
         snd_iprintf (buffer, "Preferred Sync Reference: %s\n", pref_sync_ref);
-        
+
         switch (hdsp_autosync_ref (hdsp)) {
         case HDSP_AUTOSYNC_FROM_WORD:
                 autosync_ref = "Word Clock";
@@ -3410,7 +3431,7 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                 break;
         case HDSP_AUTOSYNC_FROM_NONE:
                 autosync_ref = "None";
-                break;  
+                break;
         case HDSP_AUTOSYNC_FROM_ADAT1:
                 autosync_ref = "ADAT1";
                 break;
@@ -3425,14 +3446,14 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                 break;
         }
         snd_iprintf (buffer, "AutoSync Reference: %s\n", autosync_ref);
-        
+
         snd_iprintf (buffer, "AutoSync Frequency: %d\n", hdsp_external_sample_rate(hdsp));
-        
+
         snd_iprintf (buffer, "System Clock Mode: %s\n", system_clock_mode);
 
         snd_iprintf (buffer, "System Clock Frequency: %d\n", hdsp->system_sample_rate);
         snd_iprintf (buffer, "System Clock Locked: %s\n", hdsp->clock_source_locked ? "Yes" : "No");
-                
+
         snd_iprintf(buffer, "\n");
 
         switch (hdsp_spdif_in(hdsp)) {
@@ -3452,7 +3473,7 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                 snd_iprintf(buffer, "IEC958 input: ???\n");
                 break;
         }
-        
+
         if (hdsp->control_register & HDSP_SPDIFOpticalOut)
                 snd_iprintf(buffer, "IEC958 output: Coaxial & ADAT1\n");
         else
@@ -3510,13 +3531,13 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                 snd_iprintf (buffer, "SPDIF: No Lock\n");
         else
                 snd_iprintf (buffer, "SPDIF: %s\n", x ? "Sync" : "Lock");
-        
+
         x = status2 & HDSP_wc_sync;
         if (status2 & HDSP_wc_lock)
                 snd_iprintf (buffer, "Word Clock: %s\n", x ? "Sync" : "Lock");
         else
                 snd_iprintf (buffer, "Word Clock: No Lock\n");
-        
+
         x = status & HDSP_TimecodeSync;
         if (status & HDSP_TimecodeLock)
                 snd_iprintf(buffer, "ADAT Sync: %s\n", x ? "Sync" : "Lock");
@@ -3524,11 +3545,11 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                 snd_iprintf(buffer, "ADAT Sync: No Lock\n");
 
         snd_iprintf(buffer, "\n");
-        
+
         /* Informations about H9632 specific controls */
         if (hdsp->io_type == H9632) {
                 char *tmp;
-        
+
                 switch (hdsp_ad_gain(hdsp)) {
                 case 0:
                         tmp = "-10 dBV";
@@ -3554,7 +3575,7 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                         break;
                 }
                 snd_iprintf(buffer, "DA Gain : %s\n", tmp);
-                
+
                 switch (hdsp_phone_gain(hdsp)) {
                 case 0:
                         tmp = "0 dB";
@@ -3568,8 +3589,8 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
                 }
                 snd_iprintf(buffer, "Phones Gain : %s\n", tmp);
 
-                snd_iprintf(buffer, "XLR Breakout Cable : %s\n", hdsp_xlr_breakout_cable(hdsp) ? "yes" : "no"); 
-                
+                snd_iprintf(buffer, "XLR Breakout Cable : %s\n", hdsp_xlr_breakout_cable(hdsp) ? "yes" : "no");
+
                 if (hdsp->control_register & HDSP_AnalogExtensionBoard)
                         snd_iprintf(buffer, "AEB : on (ADAT1 internal)\n");
                 else
@@ -3632,18 +3653,18 @@ static int snd_hdsp_set_defaults(struct hdsp *hdsp)
 
         /* set defaults:
 
-           SPDIF Input via Coax 
+           SPDIF Input via Coax
            Master clock mode
            maximum latency (7 => 2^7 = 8192 samples, 64Kbyte buffer,
                             which implies 2 4096 sample, 32Kbyte periods).
-           Enable line out.                         
+           Enable line out.
          */
 
-        hdsp->control_register = HDSP_ClockModeMaster | 
-                                 HDSP_SPDIFInputCoaxial | 
-                                 hdsp_encode_latency(7) | 
+        hdsp->control_register = HDSP_ClockModeMaster |
+                                 HDSP_SPDIFInputCoaxial |
+                                 hdsp_encode_latency(7) |
                                  HDSP_LineOut;
-        
+
 
         hdsp_write(hdsp, HDSP_controlRegister, hdsp->control_register);
 
@@ -3661,7 +3682,7 @@ static int snd_hdsp_set_defaults(struct hdsp *hdsp)
         hdsp_compute_period_size(hdsp);
 
         /* silence everything */
-        
+
         for (i = 0; i < HDSP_MATRIX_MIXER_SIZE; ++i)
                 hdsp->mixer_matrix[i] = MINUS_INFINITY_GAIN;
 
@@ -3669,7 +3690,7 @@ static int snd_hdsp_set_defaults(struct hdsp *hdsp)
                 if (hdsp_write_gain (hdsp, i, MINUS_INFINITY_GAIN))
                         return -EIO;
         }
-        
+
         /* H9632 specific defaults */
         if (hdsp->io_type == H9632) {
                 hdsp->control_register |= (HDSP_DAGainPlus4dBu | HDSP_ADGainPlus4dBu | HDSP_PhoneGain0dB);
@@ -3687,12 +3708,12 @@ static int snd_hdsp_set_defaults(struct hdsp *hdsp)
 static void hdsp_midi_tasklet(unsigned long arg)
 {
         struct hdsp *hdsp = (struct hdsp *)arg;
-        
+
         if (hdsp->midi[0].pending)
                 snd_hdsp_midi_input_read (&hdsp->midi[0]);
         if (hdsp->midi[1].pending)
                 snd_hdsp_midi_input_read (&hdsp->midi[1]);
-} 
+}
 
 static irqreturn_t snd_hdsp_interrupt(int irq, void *dev_id)
 {
@@ -3704,7 +3725,7 @@ static irqreturn_t snd_hdsp_interrupt(int irq, void *dev_id)
         unsigned int midi0status;
         unsigned int midi1status;
         int schedule = 0;
-        
+
         status = hdsp_read(hdsp, HDSP_statusRegister);
 
         audio = status & HDSP_audioIRQPending;
@@ -3718,15 +3739,18 @@ static irqreturn_t snd_hdsp_interrupt(int irq, void *dev_id)
 
         midi0status = hdsp_read (hdsp, HDSP_midiStatusIn0) & 0xff;
         midi1status = hdsp_read (hdsp, HDSP_midiStatusIn1) & 0xff;
-        
+
+        if (!(hdsp->state & HDSP_InitializationComplete))
+                return IRQ_HANDLED;
+
         if (audio) {
                 if (hdsp->capture_substream)
                         snd_pcm_period_elapsed(hdsp->pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream);
-                
+
                 if (hdsp->playback_substream)
                         snd_pcm_period_elapsed(hdsp->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream);
         }
-        
+
         if (midi0 && midi0status) {
                 if (hdsp->use_midi_tasklet) {
                         /* we disable interrupts for this input until processing is done */
@@ -3769,10 +3793,10 @@ static char *hdsp_channel_buffer_location(struct hdsp *hdsp,
 
         if (snd_BUG_ON(channel < 0 || channel >= hdsp->max_channels))
                 return NULL;
-        
+
         if ((mapped_channel = hdsp->channel_map[channel]) < 0)
                 return NULL;
-        
+
         if (stream == SNDRV_PCM_STREAM_CAPTURE)
                 return hdsp->capture_buffer + (mapped_channel * HDSP_CHANNEL_BUFFER_BYTES);
         else
@@ -3965,7 +3989,7 @@ static int snd_hdsp_trigger(struct snd_pcm_substream *substream, int cmd)
         struct hdsp *hdsp = snd_pcm_substream_chip(substream);
         struct snd_pcm_substream *other;
         int running;
-        
+
         if (hdsp_check_for_iobox (hdsp))
                 return -EIO;
 
@@ -4059,10 +4083,10 @@ static struct snd_pcm_hardware snd_hdsp_playback_subinfo =
         .formats =              SNDRV_PCM_FMTBIT_S32_LE,
 #endif
         .rates =                (SNDRV_PCM_RATE_32000 |
-                                 SNDRV_PCM_RATE_44100 | 
-                                 SNDRV_PCM_RATE_48000 | 
-                                 SNDRV_PCM_RATE_64000 | 
-                                 SNDRV_PCM_RATE_88200 | 
+                                 SNDRV_PCM_RATE_44100 |
+                                 SNDRV_PCM_RATE_48000 |
+                                 SNDRV_PCM_RATE_64000 |
+                                 SNDRV_PCM_RATE_88200 |
                                  SNDRV_PCM_RATE_96000),
         .rate_min =             32000,
         .rate_max =             96000,
@@ -4088,10 +4112,10 @@ static struct snd_pcm_hardware snd_hdsp_capture_subinfo =
         .formats =              SNDRV_PCM_FMTBIT_S32_LE,
 #endif
         .rates =                (SNDRV_PCM_RATE_32000 |
-                                 SNDRV_PCM_RATE_44100 | 
-                                 SNDRV_PCM_RATE_48000 | 
-                                 SNDRV_PCM_RATE_64000 | 
-                                 SNDRV_PCM_RATE_88200 | 
+                                 SNDRV_PCM_RATE_44100 |
+                                 SNDRV_PCM_RATE_48000 |
+                                 SNDRV_PCM_RATE_64000 |
+                                 SNDRV_PCM_RATE_88200 |
                                  SNDRV_PCM_RATE_96000),
         .rate_min =             32000,
         .rate_max =             96000,
@@ -4170,7 +4194,7 @@ static int snd_hdsp_hw_rule_in_channels_rate(struct snd_pcm_hw_params *params,
                         .max = hdsp->qs_in_channels,
                         .integer = 1,
                 };
-                return snd_interval_refine(c, &t);      
+                return snd_interval_refine(c, &t);
         } else if (r->min > 48000 && r->max <= 96000) {
                 struct snd_interval t = {
                         .min = hdsp->ds_in_channels,
@@ -4201,7 +4225,7 @@ static int snd_hdsp_hw_rule_out_channels_rate(struct snd_pcm_hw_params *params,
                         .max = hdsp->qs_out_channels,
                         .integer = 1,
                 };
-                return snd_interval_refine(c, &t);      
+                return snd_interval_refine(c, &t);
         } else if (r->min > 48000 && r->max <= 96000) {
                 struct snd_interval t = {
                         .min = hdsp->ds_out_channels,
@@ -4318,8 +4342,8 @@ static int snd_hdsp_playback_open(struct snd_pcm_substream *substream)
         if (hdsp->io_type == H9632) {
                 runtime->hw.channels_min = hdsp->qs_out_channels;
                 runtime->hw.channels_max = hdsp->ss_out_channels;
-        }       
-        
+        }
+
         snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
                              snd_hdsp_hw_rule_out_channels, hdsp,
                              SNDRV_PCM_HW_PARAM_CHANNELS, -1);
@@ -4413,13 +4437,6 @@ static int snd_hdsp_capture_release(struct snd_pcm_substream *substream)
         return 0;
 }
 
-static int snd_hdsp_hwdep_dummy_op(struct snd_hwdep *hw, struct file *file)
-{
-        /* we have nothing to initialize but the call is required */
-        return 0;
-}
-
-
 /* helper functions for copying meter values */
 static inline int copy_u32_le(void __user *dest, void __iomem *src)
 {
@@ -4536,7 +4553,7 @@ static int hdsp_get_peak(struct hdsp *hdsp, struct hdsp_peak_rms __user *peak_rm
                                 hdsp->iobase + HDSP_playbackRmsLevel + i * 8 + 4,
                                 hdsp->iobase + HDSP_playbackRmsLevel + i * 8))
                         return -EFAULT;
-                if (copy_u64_le(&peak_rms->input_rms[i], 
+                if (copy_u64_le(&peak_rms->input_rms[i],
                                 hdsp->iobase + HDSP_inputRmsLevel + i * 8 + 4,
                                 hdsp->iobase + HDSP_inputRmsLevel + i * 8))
                         return -EFAULT;
@@ -4546,7 +4563,7 @@ static int hdsp_get_peak(struct hdsp *hdsp, struct hdsp_peak_rms __user *peak_rm
 
 static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct hdsp *hdsp = (struct hdsp *)hw->private_data;    
+        struct hdsp *hdsp = (struct hdsp *)hw->private_data;
         void __user *argp = (void __user *)arg;
         int err;
 
@@ -4580,7 +4597,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
                 struct hdsp_config_info info;
                 unsigned long flags;
                 int i;
-                
+
                 err = hdsp_check_for_iobox(hdsp);
                 if (err < 0)
                         return err;
@@ -4614,7 +4631,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
                         info.ad_gain = (unsigned char)hdsp_ad_gain(hdsp);
                         info.phone_gain = (unsigned char)hdsp_phone_gain(hdsp);
                         info.xlr_breakout_cable = (unsigned char)hdsp_xlr_breakout_cable(hdsp);
-                
+
                 }
                 if (hdsp->io_type == H9632 || hdsp->io_type == H9652)
                         info.analog_extension_board = (unsigned char)hdsp_aeb(hdsp);
@@ -4625,7 +4642,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
         }
         case SNDRV_HDSP_IOCTL_GET_9632_AEB: {
                 struct hdsp_9632_aeb h9632_aeb;
-                
+
                 if (hdsp->io_type != H9632) return -EINVAL;
                 h9632_aeb.aebi = hdsp->ss_in_channels - H9632_SS_CHANNELS;
                 h9632_aeb.aebo = hdsp->ss_out_channels - H9632_SS_CHANNELS;
@@ -4636,7 +4653,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
         case SNDRV_HDSP_IOCTL_GET_VERSION: {
                 struct hdsp_version hdsp_version;
                 int err;
-                
+
                 if (hdsp->io_type == H9652 || hdsp->io_type == H9632) return -EINVAL;
                 if (hdsp->io_type == Undefined) {
                         if ((err = hdsp_get_iobox_version(hdsp)) < 0)
@@ -4652,7 +4669,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
                 struct hdsp_firmware __user *firmware;
                 u32 __user *firmware_data;
                 int err;
-                
+
                 if (hdsp->io_type == H9652 || hdsp->io_type == H9632) return -EINVAL;
                 /* SNDRV_HDSP_IOCTL_GET_VERSION must have been called */
                 if (hdsp->io_type == Undefined) return -EINVAL;
@@ -4665,25 +4682,25 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
 
                 if (get_user(firmware_data, &firmware->firmware_data))
                         return -EFAULT;
-                
+
                 if (hdsp_check_for_iobox (hdsp))
                         return -EIO;
 
                 if (copy_from_user(hdsp->firmware_cache, firmware_data, sizeof(hdsp->firmware_cache)) != 0)
                         return -EFAULT;
-                
+
                 hdsp->state |= HDSP_FirmwareCached;
 
                 if ((err = snd_hdsp_load_firmware_from_cache(hdsp)) < 0)
                         return err;
-                
+
                 if (!(hdsp->state & HDSP_InitializationComplete)) {
                         if ((err = snd_hdsp_enable_io(hdsp)) < 0)
                                 return err;
-                        
-                        snd_hdsp_initialize_channels(hdsp);             
+
+                        snd_hdsp_initialize_channels(hdsp);
                         snd_hdsp_initialize_midi_flush(hdsp);
-            
+
                         if ((err = snd_hdsp_create_alsa_devices(hdsp->card, hdsp)) < 0) {
                                 snd_printk(KERN_ERR "Hammerfall-DSP: error creating alsa devices\n");
                                 return err;
@@ -4730,18 +4747,16 @@ static int snd_hdsp_create_hwdep(struct snd_card *card, struct hdsp *hdsp)
 {
         struct snd_hwdep *hw;
         int err;
-        
+
         if ((err = snd_hwdep_new(card, "HDSP hwdep", 0, &hw)) < 0)
                 return err;
-                
+
         hdsp->hwdep = hw;
         hw->private_data = hdsp;
         strcpy(hw->name, "HDSP hwdep interface");
 
-        hw->ops.open = snd_hdsp_hwdep_dummy_op;
         hw->ops.ioctl = snd_hdsp_hwdep_ioctl;
-        hw->ops.release = snd_hdsp_hwdep_dummy_op;
-                
+
         return 0;
 }
 
@@ -4774,24 +4789,24 @@ static void snd_hdsp_9652_enable_mixer (struct hdsp *hdsp)
 static int snd_hdsp_enable_io (struct hdsp *hdsp)
 {
         int i;
-        
+
         if (hdsp_fifo_wait (hdsp, 0, 100)) {
                 snd_printk(KERN_ERR "Hammerfall-DSP: enable_io fifo_wait failed\n");
                 return -EIO;
         }
-        
+
         for (i = 0; i < hdsp->max_channels; ++i) {
                 hdsp_write (hdsp, HDSP_inputEnable + (4 * i), 1);
                 hdsp_write (hdsp, HDSP_outputEnable + (4 * i), 1);
         }
-        
+
         return 0;
 }
 
 static void snd_hdsp_initialize_channels(struct hdsp *hdsp)
 {
         int status, aebi_channels, aebo_channels;
-        
+
         switch (hdsp->io_type) {
         case Digiface:
                 hdsp->card_name = "RME Hammerfall DSP + Digiface";
@@ -4804,7 +4819,7 @@ static void snd_hdsp_initialize_channels(struct hdsp *hdsp)
                 hdsp->ss_in_channels = hdsp->ss_out_channels = H9652_SS_CHANNELS;
                 hdsp->ds_in_channels = hdsp->ds_out_channels = H9652_DS_CHANNELS;
                 break;
-        
+
         case H9632:
                 status = hdsp_read(hdsp, HDSP_statusRegister);
                 /* HDSP_AEBx bits are low when AEB are connected */
@@ -4824,7 +4839,7 @@ static void snd_hdsp_initialize_channels(struct hdsp *hdsp)
                 hdsp->ss_in_channels = hdsp->ss_out_channels = MULTIFACE_SS_CHANNELS;
                 hdsp->ds_in_channels = hdsp->ds_out_channels = MULTIFACE_DS_CHANNELS;
                 break;
-                
+
         default:
                 /* should never get here */
                 break;
@@ -4840,12 +4855,12 @@ static void snd_hdsp_initialize_midi_flush (struct hdsp *hdsp)
 static int snd_hdsp_create_alsa_devices(struct snd_card *card, struct hdsp *hdsp)
 {
         int err;
-        
+
         if ((err = snd_hdsp_create_pcm(card, hdsp)) < 0) {
                 snd_printk(KERN_ERR "Hammerfall-DSP: Error creating pcm interface\n");
                 return err;
         }
-        
+
 
         if ((err = snd_hdsp_create_midi(card, hdsp, 0)) < 0) {
                 snd_printk(KERN_ERR "Hammerfall-DSP: Error creating first midi interface\n");
@@ -4876,19 +4891,19 @@ static int snd_hdsp_create_alsa_devices(struct snd_card *card, struct hdsp *hdsp
                 snd_printk(KERN_ERR "Hammerfall-DSP: Error setting default values\n");
                 return err;
         }
-        
+
         if (!(hdsp->state & HDSP_InitializationComplete)) {
                 strcpy(card->shortname, "Hammerfall DSP");
-                sprintf(card->longname, "%s at 0x%lx, irq %d", hdsp->card_name, 
+                sprintf(card->longname, "%s at 0x%lx, irq %d", hdsp->card_name,
                         hdsp->port, hdsp->irq);
-            
+
                 if ((err = snd_card_register(card)) < 0) {
                         snd_printk(KERN_ERR "Hammerfall-DSP: error registering card\n");
                         return err;
                 }
                 hdsp->state |= HDSP_InitializationComplete;
         }
-        
+
         return 0;
 }
 
@@ -4899,7 +4914,7 @@ static int hdsp_request_fw_loader(struct hdsp *hdsp)
         const char *fwfile;
         const struct firmware *fw;
         int err;
-                
+
         if (hdsp->io_type == H9652 || hdsp->io_type == H9632)
                 return 0;
         if (hdsp->io_type == Undefined) {
@@ -4908,7 +4923,7 @@ static int hdsp_request_fw_loader(struct hdsp *hdsp)
                 if (hdsp->io_type == H9652 || hdsp->io_type == H9632)
                         return 0;
         }
-        
+
         /* caution: max length of firmware filename is 30! */
         switch (hdsp->io_type) {
         case Multiface:
@@ -4942,12 +4957,12 @@ static int hdsp_request_fw_loader(struct hdsp *hdsp)
         memcpy(hdsp->firmware_cache, fw->data, sizeof(hdsp->firmware_cache));
 
         release_firmware(fw);
-                
+
         hdsp->state |= HDSP_FirmwareCached;
 
         if ((err = snd_hdsp_load_firmware_from_cache(hdsp)) < 0)
                 return err;
-                
+
         if (!(hdsp->state & HDSP_InitializationComplete)) {
                 if ((err = snd_hdsp_enable_io(hdsp)) < 0)
                         return err;
@@ -4994,14 +5009,14 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
         hdsp->max_channels = 26;
 
         hdsp->card = card;
-        
+
         spin_lock_init(&hdsp->lock);
 
         tasklet_init(&hdsp->midi_tasklet, hdsp_midi_tasklet, (unsigned long)hdsp);
-        
+
         pci_read_config_word(hdsp->pci, PCI_CLASS_REVISION, &hdsp->firmware_rev);
         hdsp->firmware_rev &= 0xff;
-        
+
         /* From Martin Bjoernsen :
             "It is important that the card's latency timer register in
             the PCI configuration space is set to a value much larger
@@ -5010,7 +5025,7 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
             to its maximum 255 to avoid problems with some computers."
         */
         pci_write_config_byte(hdsp->pci, PCI_LATENCY_TIMER, 0xFF);
-        
+
         strcpy(card->driver, "H-DSP");
         strcpy(card->mixername, "Xilinx FPGA");
 
@@ -5024,7 +5039,7 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
         } else {
                 hdsp->card_name = "RME HDSP 9632";
                 hdsp->max_channels = 16;
-                is_9632 = 1;    
+                is_9632 = 1;
         }
 
         if ((err = pci_enable_device(pci)) < 0)
@@ -5053,12 +5068,12 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
 
         if ((err = snd_hdsp_initialize_memory(hdsp)) < 0)
                 return err;
-        
+
         if (!is_9652 && !is_9632) {
-                /* we wait 2 seconds to let freshly inserted cardbus cards do their hardware init */
-                ssleep(2);
+                /* we wait a maximum of 10 seconds to let freshly
+                 * inserted cardbus cards do their hardware init */
+                err = hdsp_wait_for_iobox(hdsp, 1000, 10);
 
-                err = hdsp_check_for_iobox(hdsp);
                 if (err < 0)
                         return err;
 
@@ -5080,35 +5095,35 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
                                 return err;
                         return 0;
                 } else {
-                        snd_printk(KERN_INFO "Hammerfall-DSP: Firmware already present, initializing card.\n");     
+                        snd_printk(KERN_INFO "Hammerfall-DSP: Firmware already present, initializing card.\n");
                         if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version1)
                                 hdsp->io_type = Multiface;
-                        else 
+                        else
                                 hdsp->io_type = Digiface;
                 }
         }
-        
+
         if ((err = snd_hdsp_enable_io(hdsp)) != 0)
                 return err;
-        
+
         if (is_9652)
                 hdsp->io_type = H9652;
-        
+
         if (is_9632)
                 hdsp->io_type = H9632;
 
         if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0)
                 return err;
-        
+
         snd_hdsp_initialize_channels(hdsp);
         snd_hdsp_initialize_midi_flush(hdsp);
 
-        hdsp->state |= HDSP_FirmwareLoaded;     
+        hdsp->state |= HDSP_FirmwareLoaded;
 
         if ((err = snd_hdsp_create_alsa_devices(card, hdsp)) < 0)
                 return err;
 
-        return 0;       
+        return 0;
 }
 
 static int snd_hdsp_free(struct hdsp *hdsp)
@@ -5124,13 +5139,13 @@ static int snd_hdsp_free(struct hdsp *hdsp)
                 free_irq(hdsp->irq, (void *)hdsp);
 
         snd_hdsp_free_buffers(hdsp);
-        
+
         if (hdsp->iobase)
                 iounmap(hdsp->iobase);
 
         if (hdsp->port)
                 pci_release_regions(hdsp->pci);
-                
+
         pci_disable_device(hdsp->pci);
         return 0;
 }
@@ -5158,8 +5173,10 @@ static int __devinit snd_hdsp_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        if (!(card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct hdsp))))
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct hdsp), &card);
+        if (err < 0)
+                return err;
 
         hdsp = (struct hdsp *) card->private_data;
         card->private_free = snd_hdsp_card_free;
@@ -5173,7 +5190,7 @@ static int __devinit snd_hdsp_probe(struct pci_dev *pci,
         }
 
         strcpy(card->shortname, "Hammerfall DSP");
-        sprintf(card->longname, "%s at 0x%lx, irq %d", hdsp->card_name, 
+        sprintf(card->longname, "%s at 0x%lx, irq %d", hdsp->card_name,
                 hdsp->port, hdsp->irq);
 
         if ((err = snd_card_register(card)) < 0) {
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 71231cf1b2b0..bac2dc0c5d85 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -4100,13 +4100,6 @@ static int snd_hdspm_capture_release(struct snd_pcm_substream *substream)
         return 0;
 }
 
-static int snd_hdspm_hwdep_dummy_op(struct snd_hwdep * hw, struct file *file)
-{
-        /* we have nothing to initialize but the call is required */
-        return 0;
-}
-
-
 static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
                                  unsigned int cmd, unsigned long arg)
 {
@@ -4213,9 +4206,7 @@ static int __devinit snd_hdspm_create_hwdep(struct snd_card *card,
         hw->private_data = hdspm;
         strcpy(hw->name, "HDSPM hwdep interface");
 
-        hw->ops.open = snd_hdspm_hwdep_dummy_op;
         hw->ops.ioctl = snd_hdspm_hwdep_ioctl;
-        hw->ops.release = snd_hdspm_hwdep_dummy_op;
 
         return 0;
 }
@@ -4503,10 +4494,10 @@ static int __devinit snd_hdspm_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev],
-                            THIS_MODULE, sizeof(struct hdspm));
-        if (!card)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev],
+                              THIS_MODULE, sizeof(struct hdspm), &card);
+        if (err < 0)
+                return err;
 
         hdspm = card->private_data;
         card->private_free = snd_hdspm_card_free;
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 2570907134d7..bc539abb2105 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -2594,11 +2594,11 @@ static int __devinit snd_rme9652_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_rme9652));
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct snd_rme9652), &card);
 
-        if (!card)
-                return -ENOMEM;
+        if (err < 0)
+                return err;
 
         rme9652 = (struct snd_rme9652 *) card->private_data;
         card->private_free = snd_rme9652_card_free;
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index df2007e3be7c..baf6d8e3dabc 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -1387,9 +1387,8 @@ static int __devinit snd_sis7019_probe(struct pci_dev *pci,
         if (!enable)
                 goto error_out;
 
-        rc = -ENOMEM;
-        card = snd_card_new(index, id, THIS_MODULE, sizeof(*sis));
-        if (!card)
+        rc = snd_card_create(index, id, THIS_MODULE, sizeof(*sis), &card);
+        if (rc < 0)
                 goto error_out;
 
         strcpy(card->driver, "SiS7019");
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index cd408b86c839..d989215f3556 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -273,7 +273,8 @@ static inline void snd_sonicvibes_setdmaa(struct sonicvibes * sonic,
         outl(count, sonic->dmaa_port + SV_DMA_COUNT0);
         outb(0x18, sonic->dmaa_port + SV_DMA_MODE);
 #if 0
-        printk("program dmaa: addr = 0x%x, paddr = 0x%x\n", addr, inl(sonic->dmaa_port + SV_DMA_ADDR0));
+        printk(KERN_DEBUG "program dmaa: addr = 0x%x, paddr = 0x%x\n",
+               addr, inl(sonic->dmaa_port + SV_DMA_ADDR0));
 #endif
 }
 
@@ -288,7 +289,8 @@ static inline void snd_sonicvibes_setdmac(struct sonicvibes * sonic,
         outl(count, sonic->dmac_port + SV_DMA_COUNT0);
         outb(0x14, sonic->dmac_port + SV_DMA_MODE);
 #if 0
-        printk("program dmac: addr = 0x%x, paddr = 0x%x\n", addr, inl(sonic->dmac_port + SV_DMA_ADDR0));
+        printk(KERN_DEBUG "program dmac: addr = 0x%x, paddr = 0x%x\n",
+               addr, inl(sonic->dmac_port + SV_DMA_ADDR0));
 #endif
 }
 
@@ -355,71 +357,104 @@ static unsigned char snd_sonicvibes_in(struct sonicvibes * sonic, unsigned char
 #if 0
 static void snd_sonicvibes_debug(struct sonicvibes * sonic)
 {
-        printk("SV REGS:          INDEX = 0x%02x  ", inb(SV_REG(sonic, INDEX)));
+        printk(KERN_DEBUG
+               "SV REGS:          INDEX = 0x%02x  ", inb(SV_REG(sonic, INDEX)));
         printk("                 STATUS = 0x%02x\n", inb(SV_REG(sonic, STATUS)));
-        printk("  0x00: left input      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x00));
+        printk(KERN_DEBUG
+               "  0x00: left input      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x00));
         printk("  0x20: synth rate low  = 0x%02x\n", snd_sonicvibes_in(sonic, 0x20));
-        printk("  0x01: right input     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x01));
+        printk(KERN_DEBUG
+               "  0x01: right input     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x01));
         printk("  0x21: synth rate high = 0x%02x\n", snd_sonicvibes_in(sonic, 0x21));
-        printk("  0x02: left AUX1       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x02));
+        printk(KERN_DEBUG
+               "  0x02: left AUX1       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x02));
         printk("  0x22: ADC clock       = 0x%02x\n", snd_sonicvibes_in(sonic, 0x22));
-        printk("  0x03: right AUX1      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x03));
+        printk(KERN_DEBUG
+               "  0x03: right AUX1      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x03));
         printk("  0x23: ADC alt rate    = 0x%02x\n", snd_sonicvibes_in(sonic, 0x23));
-        printk("  0x04: left CD         = 0x%02x  ", snd_sonicvibes_in(sonic, 0x04));
+        printk(KERN_DEBUG
+               "  0x04: left CD         = 0x%02x  ", snd_sonicvibes_in(sonic, 0x04));
         printk("  0x24: ADC pll M       = 0x%02x\n", snd_sonicvibes_in(sonic, 0x24));
-        printk("  0x05: right CD        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x05));
+        printk(KERN_DEBUG
+               "  0x05: right CD        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x05));
         printk("  0x25: ADC pll N       = 0x%02x\n", snd_sonicvibes_in(sonic, 0x25));
-        printk("  0x06: left line       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x06));
+        printk(KERN_DEBUG
+               "  0x06: left line       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x06));
         printk("  0x26: Synth pll M     = 0x%02x\n", snd_sonicvibes_in(sonic, 0x26));
-        printk("  0x07: right line      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x07));
+        printk(KERN_DEBUG
+               "  0x07: right line      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x07));
         printk("  0x27: Synth pll N     = 0x%02x\n", snd_sonicvibes_in(sonic, 0x27));
-        printk("  0x08: MIC             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x08));
+        printk(KERN_DEBUG
+               "  0x08: MIC             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x08));
         printk("  0x28: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x28));
-        printk("  0x09: Game port       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x09));
+        printk(KERN_DEBUG
+               "  0x09: Game port       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x09));
         printk("  0x29: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x29));
-        printk("  0x0a: left synth      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0a));
+        printk(KERN_DEBUG
+               "  0x0a: left synth      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0a));
         printk("  0x2a: MPU401          = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2a));
-        printk("  0x0b: right synth     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0b));
+        printk(KERN_DEBUG
+               "  0x0b: right synth     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0b));
         printk("  0x2b: drive ctrl      = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2b));
-        printk("  0x0c: left AUX2       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0c));
+        printk(KERN_DEBUG
+               "  0x0c: left AUX2       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0c));
         printk("  0x2c: SRS space       = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2c));
-        printk("  0x0d: right AUX2      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0d));
+        printk(KERN_DEBUG
+               "  0x0d: right AUX2      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0d));
         printk("  0x2d: SRS center      = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2d));
-        printk("  0x0e: left analog     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0e));
+        printk(KERN_DEBUG
+               "  0x0e: left analog     = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0e));
         printk("  0x2e: wave source     = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2e));
-        printk("  0x0f: right analog    = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0f));
+        printk(KERN_DEBUG
+               "  0x0f: right analog    = 0x%02x  ", snd_sonicvibes_in(sonic, 0x0f));
         printk("  0x2f: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x2f));
-        printk("  0x10: left PCM        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x10));
+        printk(KERN_DEBUG
+               "  0x10: left PCM        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x10));
         printk("  0x30: analog power    = 0x%02x\n", snd_sonicvibes_in(sonic, 0x30));
-        printk("  0x11: right PCM       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x11));
+        printk(KERN_DEBUG
+               "  0x11: right PCM       = 0x%02x  ", snd_sonicvibes_in(sonic, 0x11));
         printk("  0x31: analog power    = 0x%02x\n", snd_sonicvibes_in(sonic, 0x31));
-        printk("  0x12: DMA data format = 0x%02x  ", snd_sonicvibes_in(sonic, 0x12));
+        printk(KERN_DEBUG
+               "  0x12: DMA data format = 0x%02x  ", snd_sonicvibes_in(sonic, 0x12));
         printk("  0x32: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x32));
-        printk("  0x13: P/C enable      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x13));
+        printk(KERN_DEBUG
+               "  0x13: P/C enable      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x13));
         printk("  0x33: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x33));
-        printk("  0x14: U/D button      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x14));
+        printk(KERN_DEBUG
+               "  0x14: U/D button      = 0x%02x  ", snd_sonicvibes_in(sonic, 0x14));
         printk("  0x34: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x34));
-        printk("  0x15: revision        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x15));
+        printk(KERN_DEBUG
+               "  0x15: revision        = 0x%02x  ", snd_sonicvibes_in(sonic, 0x15));
         printk("  0x35: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x35));
-        printk("  0x16: ADC output ctrl = 0x%02x  ", snd_sonicvibes_in(sonic, 0x16));
+        printk(KERN_DEBUG
+               "  0x16: ADC output ctrl = 0x%02x  ", snd_sonicvibes_in(sonic, 0x16));
         printk("  0x36: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x36));
-        printk("  0x17: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x17));
+        printk(KERN_DEBUG
+               "  0x17: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x17));
         printk("  0x37: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x37));
-        printk("  0x18: DMA A upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x18));
+        printk(KERN_DEBUG
+               "  0x18: DMA A upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x18));
         printk("  0x38: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x38));
-        printk("  0x19: DMA A lower cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x19));
+        printk(KERN_DEBUG
+               "  0x19: DMA A lower cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x19));
         printk("  0x39: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x39));
-        printk("  0x1a: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1a));
+        printk(KERN_DEBUG
+               "  0x1a: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1a));
         printk("  0x3a: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3a));
-        printk("  0x1b: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1b));
+        printk(KERN_DEBUG
+               "  0x1b: ---             = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1b));
         printk("  0x3b: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3b));
-        printk("  0x1c: DMA C upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1c));
+        printk(KERN_DEBUG
+               "  0x1c: DMA C upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1c));
         printk("  0x3c: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3c));
-        printk("  0x1d: DMA C upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1d));
+        printk(KERN_DEBUG
+               "  0x1d: DMA C upper cnt = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1d));
         printk("  0x3d: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3d));
-        printk("  0x1e: PCM rate low    = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1e));
+        printk(KERN_DEBUG
+               "  0x1e: PCM rate low    = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1e));
         printk("  0x3e: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3e));
-        printk("  0x1f: PCM rate high   = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1f));
+        printk(KERN_DEBUG
+               "  0x1f: PCM rate high   = 0x%02x  ", snd_sonicvibes_in(sonic, 0x1f));
         printk("  0x3f: ---             = 0x%02x\n", snd_sonicvibes_in(sonic, 0x3f));
 }
 
@@ -476,8 +511,8 @@ static void snd_sonicvibes_pll(unsigned int rate,
         *res_m = m;
         *res_n = n;
 #if 0
-        printk("metric = %i, xm = %i, xn = %i\n", metric, xm, xn);
-        printk("pll: m = 0x%x, r = 0x%x, n = 0x%x\n", reg, m, r, n);
+        printk(KERN_DEBUG "metric = %i, xm = %i, xn = %i\n", metric, xm, xn);
+        printk(KERN_DEBUG "pll: m = 0x%x, r = 0x%x, n = 0x%x\n", reg, m, r, n);
 #endif
 }
 
@@ -1423,9 +1458,9 @@ static int __devinit snd_sonic_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
  
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
         for (idx = 0; idx < 5; idx++) {
                 if (pci_resource_start(pci, idx) == 0 ||
                     !(pci_resource_flags(pci, idx) & IORESOURCE_IO)) {
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index d94b16ffb385..21cef97d478d 100644
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -89,9 +89,9 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         if ((err = snd_trident_create(card, pci,
                                       pcm_channels[dev],
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index c612b435ca2b..a9da9c184660 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -68,40 +68,40 @@ static void snd_trident_print_voice_regs(struct snd_trident *trident, int voice)
 {
         unsigned int val, tmp;
 
-        printk("Trident voice %i:\n", voice);
+        printk(KERN_DEBUG "Trident voice %i:\n", voice);
         outb(voice, TRID_REG(trident, T4D_LFO_GC_CIR));
         val = inl(TRID_REG(trident, CH_LBA));
-        printk("LBA: 0x%x\n", val);
+        printk(KERN_DEBUG "LBA: 0x%x\n", val);
         val = inl(TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC));
-        printk("GVSel: %i\n", val >> 31);
-        printk("Pan: 0x%x\n", (val >> 24) & 0x7f);
-        printk("Vol: 0x%x\n", (val >> 16) & 0xff);
-        printk("CTRL: 0x%x\n", (val >> 12) & 0x0f);
-        printk("EC: 0x%x\n", val & 0x0fff);
+        printk(KERN_DEBUG "GVSel: %i\n", val >> 31);
+        printk(KERN_DEBUG "Pan: 0x%x\n", (val >> 24) & 0x7f);
+        printk(KERN_DEBUG "Vol: 0x%x\n", (val >> 16) & 0xff);
+        printk(KERN_DEBUG "CTRL: 0x%x\n", (val >> 12) & 0x0f);
+        printk(KERN_DEBUG "EC: 0x%x\n", val & 0x0fff);
         if (trident->device != TRIDENT_DEVICE_ID_NX) {
                 val = inl(TRID_REG(trident, CH_DX_CSO_ALPHA_FMS));
-                printk("CSO: 0x%x\n", val >> 16);
+                printk(KERN_DEBUG "CSO: 0x%x\n", val >> 16);
                 printk("Alpha: 0x%x\n", (val >> 4) & 0x0fff);
-                printk("FMS: 0x%x\n", val & 0x0f);
+                printk(KERN_DEBUG "FMS: 0x%x\n", val & 0x0f);
                 val = inl(TRID_REG(trident, CH_DX_ESO_DELTA));
-                printk("ESO: 0x%x\n", val >> 16);
-                printk("Delta: 0x%x\n", val & 0xffff);
+                printk(KERN_DEBUG "ESO: 0x%x\n", val >> 16);
+                printk(KERN_DEBUG "Delta: 0x%x\n", val & 0xffff);
                 val = inl(TRID_REG(trident, CH_DX_FMC_RVOL_CVOL));
         } else {                // TRIDENT_DEVICE_ID_NX
                 val = inl(TRID_REG(trident, CH_NX_DELTA_CSO));
                 tmp = (val >> 24) & 0xff;
-                printk("CSO: 0x%x\n", val & 0x00ffffff);
+                printk(KERN_DEBUG "CSO: 0x%x\n", val & 0x00ffffff);
                 val = inl(TRID_REG(trident, CH_NX_DELTA_ESO));
                 tmp |= (val >> 16) & 0xff00;
-                printk("Delta: 0x%x\n", tmp);
-                printk("ESO: 0x%x\n", val & 0x00ffffff);
+                printk(KERN_DEBUG "Delta: 0x%x\n", tmp);
+                printk(KERN_DEBUG "ESO: 0x%x\n", val & 0x00ffffff);
                 val = inl(TRID_REG(trident, CH_NX_ALPHA_FMS_FMC_RVOL_CVOL));
-                printk("Alpha: 0x%x\n", val >> 20);
-                printk("FMS: 0x%x\n", (val >> 16) & 0x0f);
+                printk(KERN_DEBUG "Alpha: 0x%x\n", val >> 20);
+                printk(KERN_DEBUG "FMS: 0x%x\n", (val >> 16) & 0x0f);
         }
-        printk("FMC: 0x%x\n", (val >> 14) & 3);
-        printk("RVol: 0x%x\n", (val >> 7) & 0x7f);
-        printk("CVol: 0x%x\n", val & 0x7f);
+        printk(KERN_DEBUG "FMC: 0x%x\n", (val >> 14) & 3);
+        printk(KERN_DEBUG "RVol: 0x%x\n", (val >> 7) & 0x7f);
+        printk(KERN_DEBUG "CVol: 0x%x\n", val & 0x7f);
 }
 #endif
 
@@ -496,12 +496,17 @@ void snd_trident_write_voice_regs(struct snd_trident * trident,
         outl(regs[4], TRID_REG(trident, CH_START + 16));
 
 #if 0
-        printk("written %i channel:\n", voice->number);
-        printk("  regs[0] = 0x%x/0x%x\n", regs[0], inl(TRID_REG(trident, CH_START + 0)));
-        printk("  regs[1] = 0x%x/0x%x\n", regs[1], inl(TRID_REG(trident, CH_START + 4)));
-        printk("  regs[2] = 0x%x/0x%x\n", regs[2], inl(TRID_REG(trident, CH_START + 8)));
-        printk("  regs[3] = 0x%x/0x%x\n", regs[3], inl(TRID_REG(trident, CH_START + 12)));
-        printk("  regs[4] = 0x%x/0x%x\n", regs[4], inl(TRID_REG(trident, CH_START + 16)));
+        printk(KERN_DEBUG "written %i channel:\n", voice->number);
+        printk(KERN_DEBUG "  regs[0] = 0x%x/0x%x\n",
+               regs[0], inl(TRID_REG(trident, CH_START + 0)));
+        printk(KERN_DEBUG "  regs[1] = 0x%x/0x%x\n",
+               regs[1], inl(TRID_REG(trident, CH_START + 4)));
+        printk(KERN_DEBUG "  regs[2] = 0x%x/0x%x\n",
+               regs[2], inl(TRID_REG(trident, CH_START + 8)));
+        printk(KERN_DEBUG "  regs[3] = 0x%x/0x%x\n",
+               regs[3], inl(TRID_REG(trident, CH_START + 12)));
+        printk(KERN_DEBUG "  regs[4] = 0x%x/0x%x\n",
+               regs[4], inl(TRID_REG(trident, CH_START + 16)));
 #endif
 }
 
@@ -583,7 +588,7 @@ static void snd_trident_write_vol_reg(struct snd_trident * trident,
                 outb(voice->Vol >> 2, TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC + 2));
                 break;
         case TRIDENT_DEVICE_ID_SI7018:
-                // printk("voice->Vol = 0x%x\n", voice->Vol);
+                /* printk(KERN_DEBUG "voice->Vol = 0x%x\n", voice->Vol); */
                 outw((voice->CTRL << 12) | voice->Vol,
                      TRID_REG(trident, CH_GVSEL_PAN_VOL_CTRL_EC));
                 break;
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 1aafe956ee2b..809b233dd4a3 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -466,7 +466,10 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre
                                         flag = VIA_TBL_BIT_FLAG; /* period boundary */
                         } else
                                 flag = 0; /* period continues to the next */
-                        // printk("via: tbl %d: at %d  size %d (rest %d)\n", idx, ofs, r, rest);
+                        /*
+                        printk(KERN_DEBUG "via: tbl %d: at %d  size %d "
+                               "(rest %d)\n", idx, ofs, r, rest);
+                        */
                         ((u32 *)dev->table.area)[(idx<<1) + 1] = cpu_to_le32(r | flag);
                         dev->idx_table[idx].offset = ofs;
                         dev->idx_table[idx].size = r;
@@ -2360,14 +2363,14 @@ static struct snd_pci_quirk dxs_whitelist[] __devinitdata = {
         SND_PCI_QUIRK(0x1019, 0x0996, "ESC Mobo", VIA_DXS_48K),
         SND_PCI_QUIRK(0x1019, 0x0a81, "ECS K7VTA3 v8.0", VIA_DXS_NO_VRA),
         SND_PCI_QUIRK(0x1019, 0x0a85, "ECS L7VMM2", VIA_DXS_NO_VRA),
-        SND_PCI_QUIRK(0x1019, 0, "ESC K8", VIA_DXS_SRC),
+        SND_PCI_QUIRK_VENDOR(0x1019, "ESC K8", VIA_DXS_SRC),
         SND_PCI_QUIRK(0x1019, 0xaa01, "ESC K8T890-A", VIA_DXS_SRC),
         SND_PCI_QUIRK(0x1025, 0x0033, "Acer Inspire 1353LM", VIA_DXS_NO_VRA),
         SND_PCI_QUIRK(0x1025, 0x0046, "Acer Aspire 1524 WLMi", VIA_DXS_SRC),
-        SND_PCI_QUIRK(0x1043, 0, "ASUS A7/A8", VIA_DXS_NO_VRA),
-        SND_PCI_QUIRK(0x1071, 0, "Diverse Notebook", VIA_DXS_NO_VRA),
+        SND_PCI_QUIRK_VENDOR(0x1043, "ASUS A7/A8", VIA_DXS_NO_VRA),
+        SND_PCI_QUIRK_VENDOR(0x1071, "Diverse Notebook", VIA_DXS_NO_VRA),
         SND_PCI_QUIRK(0x10cf, 0x118e, "FSC Laptop", VIA_DXS_ENABLE),
-        SND_PCI_QUIRK(0x1106, 0, "ASRock", VIA_DXS_SRC),
+        SND_PCI_QUIRK_VENDOR(0x1106, "ASRock", VIA_DXS_SRC),
         SND_PCI_QUIRK(0x1297, 0xa231, "Shuttle AK31v2", VIA_DXS_SRC),
         SND_PCI_QUIRK(0x1297, 0xa232, "Shuttle", VIA_DXS_SRC),
         SND_PCI_QUIRK(0x1297, 0xc160, "Shuttle Sk41G", VIA_DXS_SRC),
@@ -2375,7 +2378,7 @@ static struct snd_pci_quirk dxs_whitelist[] __devinitdata = {
         SND_PCI_QUIRK(0x1462, 0x3800, "MSI KT266", VIA_DXS_ENABLE),
         SND_PCI_QUIRK(0x1462, 0x7120, "MSI KT4V", VIA_DXS_ENABLE),
         SND_PCI_QUIRK(0x1462, 0x7142, "MSI K8MM-V", VIA_DXS_ENABLE),
-        SND_PCI_QUIRK(0x1462, 0, "MSI Mobo", VIA_DXS_SRC),
+        SND_PCI_QUIRK_VENDOR(0x1462, "MSI Mobo", VIA_DXS_SRC),
         SND_PCI_QUIRK(0x147b, 0x1401, "ABIT KD7(-RAID)", VIA_DXS_ENABLE),
         SND_PCI_QUIRK(0x147b, 0x1411, "ABIT VA-20", VIA_DXS_ENABLE),
         SND_PCI_QUIRK(0x147b, 0x1413, "ABIT KV8 Pro", VIA_DXS_ENABLE),
@@ -2389,11 +2392,11 @@ static struct snd_pci_quirk dxs_whitelist[] __devinitdata = {
         SND_PCI_QUIRK(0x161f, 0x2032, "m680x machines", VIA_DXS_48K),
         SND_PCI_QUIRK(0x1631, 0xe004, "PB EasyNote 3174", VIA_DXS_ENABLE),
         SND_PCI_QUIRK(0x1695, 0x3005, "EPoX EP-8K9A", VIA_DXS_ENABLE),
-        SND_PCI_QUIRK(0x1695, 0, "EPoX mobo", VIA_DXS_SRC),
-        SND_PCI_QUIRK(0x16f3, 0, "Jetway K8", VIA_DXS_SRC),
-        SND_PCI_QUIRK(0x1734, 0, "FSC Laptop", VIA_DXS_SRC),
+        SND_PCI_QUIRK_VENDOR(0x1695, "EPoX mobo", VIA_DXS_SRC),
+        SND_PCI_QUIRK_VENDOR(0x16f3, "Jetway K8", VIA_DXS_SRC),
+        SND_PCI_QUIRK_VENDOR(0x1734, "FSC Laptop", VIA_DXS_SRC),
         SND_PCI_QUIRK(0x1849, 0x3059, "ASRock K7VM2", VIA_DXS_NO_VRA),
-        SND_PCI_QUIRK(0x1849, 0, "ASRock mobo", VIA_DXS_SRC),
+        SND_PCI_QUIRK_VENDOR(0x1849, "ASRock mobo", VIA_DXS_SRC),
         SND_PCI_QUIRK(0x1919, 0x200a, "Soltek SL-K8",  VIA_DXS_NO_VRA),
         SND_PCI_QUIRK(0x4005, 0x4710, "MSI K7T266", VIA_DXS_SRC),
         { } /* terminator */
@@ -2433,9 +2436,9 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
         unsigned int i;
         int err;
 
-        card = snd_card_new(index, id, THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         card_type = pci_id->driver_data;
         switch (card_type) {
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 5bd79d2a5a15..0d54e3503c1e 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -328,7 +328,10 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre
                                         flag = VIA_TBL_BIT_FLAG; /* period boundary */
                         } else
                                 flag = 0; /* period continues to the next */
-                        // printk("via: tbl %d: at %d  size %d (rest %d)\n", idx, ofs, r, rest);
+                        /*
+                        printk(KERN_DEBUG "via: tbl %d: at %d  size %d "
+                               "(rest %d)\n", idx, ofs, r, rest);
+                        */
                         ((u32 *)dev->table.area)[(idx<<1) + 1] = cpu_to_le32(r | flag);
                         dev->idx_table[idx].offset = ofs;
                         dev->idx_table[idx].size = r;
@@ -1167,9 +1170,9 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
         unsigned int i;
         int err;
 
-        card = snd_card_new(index, id, THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         card_type = pci_id->driver_data;
         switch (card_type) {
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index acc352f4a441..fc9136c3e0d7 100644
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -204,9 +204,9 @@ static int __devinit snd_vx222_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         switch ((int)pci_id->driver_data) {
         case VX_PCI_VX222_OLD:
diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c
index 7e87f398ff0b..c0efe4491116 100644
--- a/sound/pci/vx222/vx222_ops.c
+++ b/sound/pci/vx222/vx222_ops.c
@@ -107,7 +107,9 @@ static unsigned char vx2_inb(struct vx_core *chip, int offset)
 static void vx2_outb(struct vx_core *chip, int offset, unsigned char val)
 {
         outb(val, vx2_reg_addr(chip, offset));
-        //printk("outb: %x -> %x\n", val, vx2_reg_addr(chip, offset));
+        /*
+        printk(KERN_DEBUG "outb: %x -> %x\n", val, vx2_reg_addr(chip, offset));
+        */
 }
 
 /**
@@ -126,7 +128,9 @@ static unsigned int vx2_inl(struct vx_core *chip, int offset)
  */
 static void vx2_outl(struct vx_core *chip, int offset, unsigned int val)
 {
-        // printk("outl: %x -> %x\n", val, vx2_reg_addr(chip, offset));
+        /*
+        printk(KERN_DEBUG "outl: %x -> %x\n", val, vx2_reg_addr(chip, offset));
+        */
         outl(val, vx2_reg_addr(chip, offset));
 }
 
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index 2631a554845e..4af66661f9b0 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -187,9 +187,9 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        if (err < 0)
+                return err;
 
         switch (pci_id->device) {
         case 0x0004: str = "YMF724";  model = "DS-1"; break;
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 90d0d62bd0b4..2f0925236a1b 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -318,7 +318,12 @@ static void snd_ymfpci_pcm_interrupt(struct snd_ymfpci *chip, struct snd_ymfpci_
                 ypcm->period_pos += delta;
                 ypcm->last_pos = pos;
                 if (ypcm->period_pos >= ypcm->period_size) {
-                        // printk("done - active_bank = 0x%x, start = 0x%x\n", chip->active_bank, voice->bank[chip->active_bank].start);
+                        /*
+                        printk(KERN_DEBUG
+                               "done - active_bank = 0x%x, start = 0x%x\n",
+                               chip->active_bank,
+                               voice->bank[chip->active_bank].start);
+                        */
                         ypcm->period_pos %= ypcm->period_size;
                         spin_unlock(&chip->reg_lock);
                         snd_pcm_period_elapsed(ypcm->substream);
@@ -366,7 +371,12 @@ static void snd_ymfpci_pcm_capture_interrupt(struct snd_pcm_substream *substream
                 ypcm->last_pos = pos;
                 if (ypcm->period_pos >= ypcm->period_size) {
                         ypcm->period_pos %= ypcm->period_size;
-                        // printk("done - active_bank = 0x%x, start = 0x%x\n", chip->active_bank, voice->bank[chip->active_bank].start);
+                        /*
+                        printk(KERN_DEBUG
+                               "done - active_bank = 0x%x, start = 0x%x\n",
+                               chip->active_bank,
+                               voice->bank[chip->active_bank].start);
+                        */
                         spin_unlock(&chip->reg_lock);
                         snd_pcm_period_elapsed(substream);
                         spin_lock(&chip->reg_lock);